[issue984] backout + rollback causes weird state

[Dirkjan Ochtman]

New submission from Dirkjan Ochtman <dirkjan at ochtman.nl>:

djc at darwin tmp $ hg init hgtest
djc at darwin tmp $ cd hgtest
djc at darwin hgtest $ echo a > a
djc at darwin hgtest $ hg ci -m "c"
nothing changed
djc at darwin hgtest $ hg add a
djc at darwin hgtest $ hg ci -m "c"
djc at darwin hgtest $ echo b > b
djc at darwin hgtest $ hg add b
djc at darwin hgtest $ hg ci -m "D"
djc at darwin hgtest $ hg log
changeset:   1:fcda208a48f1
tag:         tip
user:        Dirkjan Ochtman <dirkjan at ochtman.nl>
date:        Wed Feb 13 15:13:06 2008 +0100
summary:     D

changeset:   0:e23e0706b85b
user:        Dirkjan Ochtman <dirkjan at ochtman.nl>
date:        Wed Feb 13 15:12:56 2008 +0100
summary:     c

djc at darwin hgtest $ hg backout 1
removing b
changeset 2:894415e42172 backs out changeset 1:fcda208a48f1
djc at darwin hgtest $ hg rollback
rolling back last transaction
djc at darwin hgtest $ hg st
R b
djc at darwin hgtest $ hg diff
diff -r fcda208a48f1 b
--- a/b Wed Feb 13 15:13:06 2008 +0100
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-b

This seems weird to me. After rolling back the backout, I'd expect hg st to show
no modifications at all. After all, before I did the backout, there weren't any
modification either. Currently, it seems rollback only rolls back the
transaction, not the revert itself. I think this is counter-intuitive.

----------
assignedto: alexis
messages: 5245
nosy: alexis, djc
priority: bug
status: unread
title: backout + rollback causes weird state
topic: surprise, ui

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