[issue1431] hg update no longer mentions old changeset when internal merge fails

Neil Rashbrook mercurial-bugs at selenic.com
Wed Dec 10 15:08:45 CST 2008


New submission from Neil Rashbrook <neil at parkwaycc.co.uk>:

Since the project I work on pulls from three repos I have a script that pulls
and updates them all in turn, so I can leave it running in the background while
working on something else. I have uncommited changes in my working directory so
occasionally hg has to merge them in. However the behaviour for when the
internal merge fails has changed; 1.0 would suggest updating to the previous
changeset to retry the merge but 1.1 simply suggests using hg resolve. I need
the previous changeset information to get a diff of the failed update to the
file that I can then use to hand merge into my working directory.

----------
messages: 8157
nosy: Neil, djc
priority: wish
status: unread
title: hg update no longer mentions old changeset when internal merge fails

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1431>
____________________________________________________



More information about the Mercurial-devel mailing list