Message387

Author ThomasAH
Recipients Omnifarious, mpm
Date 2006-01-17.15:58:16
Content
When hgmerge returns with an error code, Mercurial simply ignores this fact.

What you can do is:
hg co -C `hg parents -q|head -n 1|cut -d: -f1` && hg co -m

But it would be good to know about the problem.
(there are "merging foo failed!" messages, but with the following call to
hgmerge this might not be visible on the screen anymore)
History
Date User Action Args
2006-01-17 15:58:19ThomasAHsetmessageid: <1137513499.04.0.587650500095.issue12@selenic.com>
2006-01-17 15:58:19ThomasAHsetrecipients: + mpm, Omnifarious
2006-01-17 15:58:19ThomasAHlinkissue12 messages
2006-01-17 15:58:16ThomasAHcreate