Show More
@@ -65,17 +65,32 b' working dir unaffected by rollback: do n' | |||
|
65 | 65 | $ hg commit -m'modify a again' |
|
66 | 66 | $ echo b > b |
|
67 | 67 | $ hg bookmark bar -r default #making bar active, before the transaction |
|
68 | $ hg log -G --template '{rev} [{branch}] ({bookmarks}) {desc|firstline}\n' | |
|
69 | @ 1 [test] (foo) modify a again | |
|
70 | | | |
|
71 | o 0 [default] (bar) add a again | |
|
72 | ||
|
68 | 73 | $ hg commit -Am'add b' |
|
69 | 74 | adding b |
|
70 | $ hg log --template '{rev} {branch} {desc|firstline}\n' | |
|
71 | 2 test add b | |
|
72 | 1 test modify a again | |
|
73 | 0 default add a again | |
|
75 | $ hg log -G --template '{rev} [{branch}] ({bookmarks}) {desc|firstline}\n' | |
|
76 | @ 2 [test] (foo) add b | |
|
77 | | | |
|
78 | o 1 [test] () modify a again | |
|
79 | | | |
|
80 | o 0 [default] (bar) add a again | |
|
81 | ||
|
74 | 82 | $ hg update bar |
|
75 | 83 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
76 | 84 | (activating bookmark bar) |
|
77 | 85 | $ cat .hg/undo.branch ; echo |
|
78 | 86 | test |
|
87 | $ hg log -G --template '{rev} [{branch}] ({bookmarks}) {desc|firstline}\n' | |
|
88 | o 2 [test] (foo) add b | |
|
89 | | | |
|
90 | o 1 [test] () modify a again | |
|
91 | | | |
|
92 | @ 0 [default] (bar) add a again | |
|
93 | ||
|
79 | 94 | $ hg rollback |
|
80 | 95 | abort: rollback of last commit while not checked out may lose data |
|
81 | 96 | (use -f to force) |
@@ -84,6 +99,11 b' working dir unaffected by rollback: do n' | |||
|
84 | 99 | repository tip rolled back to revision 1 (undo commit) |
|
85 | 100 |
$ |
|
86 | 101 | 0 |
|
102 | $ hg log -G --template '{rev} [{branch}] ({bookmarks}) {desc|firstline}\n' | |
|
103 | o 1 [test] (foo) modify a again | |
|
104 | | | |
|
105 | @ 0 [default] (bar) add a again | |
|
106 | ||
|
87 | 107 |
$ |
|
88 | 108 | default |
|
89 | 109 | $ cat .hg/bookmarks.current ; echo |
General Comments 0
You need to be logged in to leave comments.
Login now