comparison tests/test-convert-cvs.t @ 13446:1e497df514e2 stable

rollback: clarifies the message about the reverted state (issue2628) Previously, when rolling back a transaction, some users could be confused between the level to which the store is rolled back, and the new parents of the working directory. $ hg rollback rolling back to revision 4 (undo commit) With this change: $ hg rollback repository tip rolled back to tip revision 4 (undo commit) working directory now based on revision 2 and 1 So now the user can realize that the store has been rolled back to an older tip, but also that the working directory may not on the tip (here we are rolling back the merge of the heads 2 and 1)
author Gilles Moris <gilles.moris@free.fr>
date Thu, 10 Feb 2011 09:03:06 +0100
parents 6cc4b14fb76b
children 7c26ce9edbd2
comparison
equal deleted inserted replaced
13445:61a898576888 13446:1e497df514e2
109 sorting... 109 sorting...
110 converting... 110 converting...
111 2 Initial revision 111 2 Initial revision
112 1 import 112 1 import
113 filtering out empty revision 113 filtering out empty revision
114 rolling back to revision 0 (undo commit) 114 repository tip rolled back to revision 0 (undo commit)
115 working directory now based on revision -1
115 0 ci0 116 0 ci0
116 updating tags 117 updating tags
117 $ hgcat b/c 118 $ hgcat b/c
118 c 119 c
119 c 120 c