Why Did Mercurial Add Files During a Merge Between Branches?
Jensen, Aaron
ajensen at webmd.net
Tue Oct 2 19:09:46 UTC 2012
> Then you're probably left with either a hardware glitch or undiagnosed user error[1].
>
> [1] Some day I'll finish the blackbox extension that records everything a user does for forensic purposes.
Sold!
Thanks for your help. I was able to correct the problem by replaying the merge (correctly, this time), then merging in the bad merge, reverting it, then committing it. Finally, I merged mainline in and everything is the way it should be:
> hg up bad-merge-parent1
> hg merge bad-merge-parent2
> hg commit -m "Re-merging bad-merge correctly."
> hg merge bad-merge --tool internal:local
> hg revert --all -r tip
> hg commit -m "Wiping out bad merge."
> hg merge
> hg commit -m "Merge"
<:> Aaron
More information about the Mercurial
mailing list