Show More
@@ -1171,13 +1171,17 b' def _finishhistedit(ui, repo, state):' | |||
|
1171 | 1171 | for n in succs[1:]: |
|
1172 | 1172 | ui.debug(m % node.short(n)) |
|
1173 | 1173 | |
|
1174 | safecleanupnode(ui, repo, tmpnodes) | |
|
1175 | ||
|
1176 | 1174 | if not state.keep: |
|
1177 | 1175 | if mapping: |
|
1178 | 1176 | movebookmarks(ui, repo, mapping, state.topmost, ntm) |
|
1179 | 1177 | # TODO update mq state |
|
1180 | safecleanupnode(ui, repo, mapping) | |
|
1178 | else: | |
|
1179 | mapping = {} | |
|
1180 | ||
|
1181 | for n in tmpnodes: | |
|
1182 | mapping[n] = () | |
|
1183 | ||
|
1184 | safecleanupnode(ui, repo, mapping) | |
|
1181 | 1185 | |
|
1182 | 1186 | state.clear() |
|
1183 | 1187 | if os.path.exists(repo.sjoin('undo')): |
@@ -265,7 +265,6 b' short hash. This tests issue3893.' | |||
|
265 | 265 | HG: branch 'default' |
|
266 | 266 | HG: changed alpha |
|
267 | 267 | saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob) |
|
268 | saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob) | |
|
269 | 268 | |
|
270 | 269 | $ hg update -q 2 |
|
271 | 270 | $ echo x > x |
@@ -87,8 +87,7 b'' | |||
|
87 | 87 | > fold e860deea161a 4 e |
|
88 | 88 | > pick 652413bf663e 5 f |
|
89 | 89 | > EOF |
|
90 |
saved backup bundle to $TESTTMP/r/.hg/strip-backup/96e494a2d553- |
|
|
91 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-48787b8d-backup.hg (glob) | |
|
90 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/96e494a2d553-45c027ab-backup.hg (glob) | |
|
92 | 91 | $ hg log --graph |
|
93 | 92 | @ changeset: 3:cacdfd884a93 |
|
94 | 93 | | bookmark: five |
@@ -418,7 +418,6 b" Now, let's try to fold the second commit" | |||
|
418 | 418 | |
|
419 | 419 | $ HGEDITOR="sh ./editor.sh" hg histedit 0 |
|
420 | 420 | saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) |
|
421 | saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) | |
|
422 | 421 | |
|
423 | 422 | $ hg --config diff.git=yes export 0 |
|
424 | 423 | # HG changeset patch |
@@ -382,8 +382,7 b' dropped revision.' | |||
|
382 | 382 | HG: user: test |
|
383 | 383 | HG: branch 'default' |
|
384 | 384 | HG: changed file |
|
385 |
saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/ |
|
|
386 | saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-a35700fc-backup.hg (glob) | |
|
385 | saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-3d69522c-backup.hg (glob) | |
|
387 | 386 | $ hg logt -G |
|
388 | 387 | @ 1:10c647b2cdd5 +4 |
|
389 | 388 | | |
@@ -170,13 +170,13 b' Base setup for the rest of the testing' | |||
|
170 | 170 | o 0:cb9a9f314b8b a |
|
171 | 171 | |
|
172 | 172 | $ hg debugobsolete |
|
173 | 96e494a2d553dd05902ba1cee1d94d4cb7b8faed 0 {b346ab9a313db8537ecf96fca3ca3ca984ef3bd7} (*) {'user': 'test'} (glob) | |
|
174 | b558abc46d09c30f57ac31e85a8a3d64d2e906e4 0 {96e494a2d553dd05902ba1cee1d94d4cb7b8faed} (*) {'user': 'test'} (glob) | |
|
175 | 173 | d2ae7f538514cd87c17547b0de4cea71fe1af9fb 0 {cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b} (*) {'user': 'test'} (glob) |
|
176 | 174 | 177f92b773850b59254aa5e923436f921b55483b b346ab9a313db8537ecf96fca3ca3ca984ef3bd7 0 (*) {'user': 'test'} (glob) |
|
177 | 175 | 055a42cdd88768532f9cf79daa407fc8d138de9b 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (*) {'user': 'test'} (glob) |
|
178 | 176 | e860deea161a2f77de56603b340ebbb4536308ae 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (*) {'user': 'test'} (glob) |
|
179 | 177 | 652413bf663ef2a641cab26574e46d5f5a64a55a cacdfd884a9321ec4e1de275ef3949fa953a1f83 0 (*) {'user': 'test'} (glob) |
|
178 | 96e494a2d553dd05902ba1cee1d94d4cb7b8faed 0 {b346ab9a313db8537ecf96fca3ca3ca984ef3bd7} (*) {'user': 'test'} (glob) | |
|
179 | b558abc46d09c30f57ac31e85a8a3d64d2e906e4 0 {96e494a2d553dd05902ba1cee1d94d4cb7b8faed} (*) {'user': 'test'} (glob) | |
|
180 | 180 | |
|
181 | 181 | |
|
182 | 182 | Ensure hidden revision does not prevent histedit |
General Comments 0
You need to be logged in to leave comments.
Login now