[issue2628] rollback after "backout --merge" restores bad revision
Antoine Pitrou
bugs at mercurial.selenic.com
Mon Feb 7 01:53:00 UTC 2011
New submission from Antoine Pitrou <pitrou at free.fr>:
See following script. rollback should base working copy on to the one it was
based on before the backout was issued, but instead bases it on the backed
out revision. What's more, the message output by rollback actually mentions
the right revision.
rm -rf myrepo
hg init myrepo
cd myrepo
echo "a" > a
hg ci -A -m "first commit"
echo "b" > b
hg ci -A -m "second commit"
echo "c" > c
hg ci -A -m "third commit"
hg id -n # displays "3"
hg backout --merge 1 -m "fourth commit"
hg rollback # displays "rolling back to revision 2"
hg id -n # should display "2+"
----------
messages: 15143
nosy: pitrou
priority: bug
status: unread
title: rollback after "backout --merge" restores bad revision
____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2628>
____________________________________________________
More information about the Mercurial-devel
mailing list