equal
deleted
inserted
replaced
62 named branch could not be reset: current branch is still 'test' |
62 named branch could not be reset: current branch is still 'test' |
63 working directory now based on revision 0 |
63 working directory now based on revision 0 |
64 $ hg branch |
64 $ hg branch |
65 test |
65 test |
66 |
66 |
|
67 working dir unaffected by rollback: do not restore dirstate et. al. |
|
68 $ hg log --template '{rev} {branch} {desc|firstline}\n' |
|
69 0 default add a again |
|
70 $ hg status |
|
71 M a |
|
72 $ hg bookmark foo |
|
73 $ hg commit -m'modify a again' |
|
74 $ echo b > b |
|
75 $ hg commit -Am'add b' |
|
76 adding b |
|
77 $ hg log --template '{rev} {branch} {desc|firstline}\n' |
|
78 2 test add b |
|
79 1 test modify a again |
|
80 0 default add a again |
|
81 $ hg update default |
|
82 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
83 $ hg bookmark bar |
|
84 $ cat .hg/undo.branch ; echo |
|
85 test |
|
86 $ hg rollback |
|
87 repository tip rolled back to revision 1 (undo commit) |
|
88 $ hg id -n |
|
89 0 |
|
90 $ hg branch |
|
91 default |
|
92 $ cat .hg/bookmarks.current ; echo |
|
93 bar |
|
94 $ hg bookmark --delete foo |
|
95 |
67 rollback by pretxncommit saves commit message (issue 1635) |
96 rollback by pretxncommit saves commit message (issue 1635) |
68 |
97 |
69 $ echo a >> a |
98 $ echo a >> a |
70 $ hg --config hooks.pretxncommit=false commit -m"precious commit message" |
99 $ hg --config hooks.pretxncommit=false commit -m"precious commit message" |
71 transaction abort! |
100 transaction abort! |
100 $ hg clone http://localhost:$HGPORT u |
129 $ hg clone http://localhost:$HGPORT u |
101 requesting all changes |
130 requesting all changes |
102 adding changesets |
131 adding changesets |
103 adding manifests |
132 adding manifests |
104 adding file changes |
133 adding file changes |
105 added 2 changesets with 2 changes to 1 files |
134 added 3 changesets with 2 changes to 1 files (+1 heads) |
106 updating to branch default |
135 updating to branch default |
107 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
136 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
108 $ cd u |
137 $ cd u |
109 $ hg id default |
138 $ hg id default |
110 8902593132ae |
139 068774709090 |
111 |
140 |
112 now rollback and observe that 'hg serve' reloads the repository and |
141 now rollback and observe that 'hg serve' reloads the repository and |
113 presents the correct tip changeset: |
142 presents the correct tip changeset: |
114 |
143 |
115 $ hg -R ../t rollback |
144 $ hg -R ../t rollback |
116 repository tip rolled back to revision 0 (undo commit) |
145 repository tip rolled back to revision 1 (undo commit) |
117 working directory now based on revision 0 |
146 working directory now based on revision 0 |
118 $ hg id default |
147 $ hg id default |
119 23b0221f3370 |
148 791dd2169706 |