comparison tests/test-rebase-obsolete.t @ 31297:f5c71e98f0f7

rebase: unhide original working directory node as well (issue5219) By including the working directory revision at the start of rebase in the repo._rebaseset, we make sure it's not hidden when we update back to it at the end of the rebase. This feels like abusing the set a bit given its name (_rebaseset), but I couldn't think of another name that's clearly better.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 10 Mar 2017 23:07:20 -0800
parents 7f869d81ab54
children 3546a771e376
comparison
equal deleted inserted replaced
31296:98658f73588a 31297:f5c71e98f0f7
277 even though it is hidden (until we're moved there). 277 even though it is hidden (until we're moved there).
278 278
279 $ hg --hidden up -qr 'first(hidden())' 279 $ hg --hidden up -qr 'first(hidden())'
280 $ hg rebase --rev 13 --dest 15 280 $ hg rebase --rev 13 --dest 15
281 rebasing 13:98f6af4ee953 "C" 281 rebasing 13:98f6af4ee953 "C"
282 transaction abort! 282 $ hg log -G
283 rollback completed 283 o 16:294a2b93eb4d C
284 abort: hidden revision '1'! 284 |
285 (use --hidden to access hidden revisions) 285 o 15:627d46148090 D
286 [255] 286 |
287 | o 12:462a34d07e59 B
288 | |
289 | o 11:4596109a6a43 D
290 | |
291 | o 7:02de42196ebe H
292 | |
293 +---o 6:eea13746799a G
294 | |/
295 | o 5:24b6387c8c8c F
296 | |
297 o | 4:9520eea781bc E
298 |/
299 | @ 1:42ccdea3bb16 B
300 |/
301 o 0:cd010b8cd998 A
302
287 303
288 $ cd .. 304 $ cd ..
289 305
290 collapse rebase 306 collapse rebase
291 --------------------------------- 307 ---------------------------------