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)
Showing
- mercurial/localrepo.py 6 additions, 2 deletionsmercurial/localrepo.py
- tests/test-acl.t 14 additions, 7 deletionstests/test-acl.t
- tests/test-backout.t 2 additions, 1 deletiontests/test-backout.t
- tests/test-bookmarks-strip.t 2 additions, 1 deletiontests/test-bookmarks-strip.t
- tests/test-bundle-r.t 8 additions, 4 deletionstests/test-bundle-r.t
- tests/test-bundle.t 6 additions, 3 deletionstests/test-bundle.t
- tests/test-convert-cvs.t 2 additions, 1 deletiontests/test-convert-cvs.t
- tests/test-diff-color.t 2 additions, 1 deletiontests/test-diff-color.t
- tests/test-hook.t 2 additions, 1 deletiontests/test-hook.t
- tests/test-import.t 2 additions, 1 deletiontests/test-import.t
- tests/test-keyword.t 16 additions, 8 deletionstests/test-keyword.t
- tests/test-newbranch.t 2 additions, 1 deletiontests/test-newbranch.t
- tests/test-notify.t 6 additions, 3 deletionstests/test-notify.t
- tests/test-pull-r.t 2 additions, 1 deletiontests/test-pull-r.t
- tests/test-pull.t 1 addition, 1 deletiontests/test-pull.t
- tests/test-push-http.t 2 additions, 1 deletiontests/test-push-http.t
- tests/test-rename-after-merge.t 2 additions, 1 deletiontests/test-rename-after-merge.t
- tests/test-rollback.t 6 additions, 3 deletionstests/test-rollback.t
- tests/test-tag.t 2 additions, 1 deletiontests/test-tag.t
- tests/test-tags.t 2 additions, 1 deletiontests/test-tags.t
Loading
Please register or sign in to comment