<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div><br></div> The emergency was only in my repository, never in the master.<div><br></div><div> Barry</div><div><br><div><div>On Jun 26, 2010, at 6:05 PM, Matthew Knepley wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite">Is this fixed? Can someone mail when it is over?<div><br></div><div>For post mortem, how did this happen? The only way I can</div><div>think of is that</div><div><br></div><div> a) Someone forced a push (never never never to this)</div>
<div><br></div><div> b) Someone pulled into a repo that already had multiple heads</div><div><br></div><div> c) Someone checked in a changset in the middle of a merge</div><div><br></div><div> Matt<br><br><div class="gmail_quote">
On Sat, Jun 26, 2010 at 11:19 PM, Satish Balay <span dir="ltr"><<a href="mailto:balay@mcs.anl.gov">balay@mcs.anl.gov</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div><div></div><div class="h5">On Sat, 26 Jun 2010, Satish Balay wrote:<br>
<br>
> On Sat, 26 Jun 2010, Barry Smith wrote:<br>
><br>
> ><br>
> > I need help. FAQ.html has "instructions" to fix this but the instructions are not complete enough: they say<br>
> ><br>
> > "Fixing this is complicated. Basically, you clone the repo<br>
> > before you made head #2, then create the diff for the bad changeset<br>
> > that made head #2. Apply it to the clone and checkin, then pull the<br>
> > master.<br>
> ><br>
> > Now<br>
> ><br>
> > 1) how do I clone the repo before you made head #2?<br>
> > 2) how do you create the diff for the bad changeset that made head # 2<br>
> > 3) how do you apply it to the clone<br>
> > 4) how do you checkin? Never heard of checkin in mecurial<br>
> ><br>
> > Please let me know this and I will also update the FAQ.<br>
> ><br>
> ><br>
> ><br>
> > [barry-smiths-macbook-pro:src/sys/totalview] barrysmith% hg merge<br>
> > abort: outstanding uncommitted changes (use 'hg status' to list changes)<br>
> ><br>
> > [barry-smiths-macbook-pro:src/sys/totalview] barrysmith% hg commit<br>
> > nothing changed<br>
> ><br>
> > [barry-smiths-macbook-pro:src/sys/totalview] barrysmith% hg status | head -5<br>
> > ! src/ksp/ksp/examples/tutorials/ex1.c<br>
><br>
> Looks like some files are deleted. Commit doesn't pick it up<br>
> automatically. [unless 'hg rm' is used for the deletion]<br>
><br>
> > ? !<br>
> > ? #configure.log#<br>
> > ? arch-g++.py<br>
> > ? bin/#petscrun#<br>
> > [<br>
> ><br>
> > [barry-smiths-macbook-pro:src/sys/totalview] barrysmith% hg heads<br>
> > changeset: 16298:503f0f312436<br>
> > tag: tip<br>
> > parent: 16297:53f17d50e2f2<br>
> > parent: 16296:90b6abac8d23<br>
> > user: Victor Minden <a href="mailto:victorminden@gmail.com">victorminden@gmail.com</a><br>
> > date: Fri Jun 25 15:25:05 2010 -0500<br>
> > description:<br>
> > commit after merge<br>
> ><br>
> ><br>
> > changeset: 16291:47055b889013<br>
> > user: Barry Smith <a href="mailto:bsmith@mcs.anl.gov">bsmith@mcs.anl.gov</a><br>
> > date: Sat Jun 26 09:54:02 2010 -0500<br>
> > files: src/docs/website/documentation/codemanagement.html src/docs/website/documentation/linearsolvertable.html src/docs/website/features/index.html src/docs/website/miscellaneous/acknwldg.html src/docs/website/miscellaneous/funding.html src/sys/makefile src/sys/totalview/makefile src/sys/totalview/tv_data_display.c src/sys/totalview/tv_data_display.h<br>
> > description:<br>
> > minor cleanup of docs<br>
> > added totalview include and source for debugger<br>
><br>
><br>
> I would do:<br>
><br>
> hg update -C 47055b889013<br>
> hg merge<br>
> hg commit<br>
<br>
</div></div>I should have added: the above instructions are for the case where<br>
local changes can be discarded. If I have to preserve the local<br>
changes [depending upon how the changes were done] - I might use some<br>
different process.<br>
<br>
The following might work for almost all cases [since the merge is<br>
interfering with the local changes - do the merge in a different/clean<br>
repo]<br>
<br>
i.e:<br>
<br>
hg clone -r 47055b889013 petsc-dev petsc-dev-merge<br>
cd petsc-dev-merge<br>
hg pull [tip]<br>
hg merge<br>
hg commit<br>
hg push [../petsc-dev]<br>
cd ../petsc-dev<br>
<br>
hg status<br>
hg update or 'hg commit/hg merge' or somethig suitable for commiting local changes and merging<br>
local changes<br>
<br>
hg push [<a href="http://petsc.cs.iit.edu/" target="_blank">petsc.cs.iit.edu</a>]<br>
<font color="#888888"><br>
Satish<br>
</font></blockquote></div><br><br clear="all"><br>-- <br>What most experimenters take for granted before they begin their experiments is infinitely more interesting than any results to which their experiments lead.<br>-- Norbert Wiener<br>
</div>
</blockquote></div><br></div></body></html>