Mercurial > hg
comparison tests/test-rebase-detach.t @ 26811:d1561a422748
rebase: fix wrong 'no changes to commit' when using --collapse
--collapse will do that rebase doesn't commit until the final commit. The lack
of a new commit would make it look like the rebase didn't contribute any
changes.
Instead, only warn about no commits when not using --collapse.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Mon, 19 Oct 2015 16:29:35 +0200 |
parents | ef1eb6df7071 |
children | 157675d0f600 |
comparison
equal
deleted
inserted
replaced
26810:382050000412 | 26811:d1561a422748 |
---|---|
210 |/ | 210 |/ |
211 o 0: 'A' | 211 o 0: 'A' |
212 | 212 |
213 $ hg rebase --collapse -s 2 -d 7 | 213 $ hg rebase --collapse -s 2 -d 7 |
214 rebasing 2:5fddd98957c8 "C" | 214 rebasing 2:5fddd98957c8 "C" |
215 note: rebase of 2:5fddd98957c8 created no changes to commit | |
216 rebasing 3:32af7686d403 "D" | 215 rebasing 3:32af7686d403 "D" |
217 note: rebase of 3:32af7686d403 created no changes to commit | |
218 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) | 216 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) |
219 | 217 |
220 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" | 218 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
221 o 6:secret 'Collapsed revision | 219 o 6:secret 'Collapsed revision |
222 | * C | 220 | * C |
339 $ echo "J" >> F | 337 $ echo "J" >> F |
340 $ hg ci -m "J" | 338 $ hg ci -m "J" |
341 | 339 |
342 $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other | 340 $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other |
343 rebasing 8:9790e768172d "I" | 341 rebasing 8:9790e768172d "I" |
344 note: rebase of 8:9790e768172d created no changes to commit | |
345 rebasing 9:5d7b11f5fb97 "Merge" | 342 rebasing 9:5d7b11f5fb97 "Merge" |
346 note: rebase of 9:5d7b11f5fb97 created no changes to commit | |
347 rebasing 10:9427d4d5af81 "J" (tip) | 343 rebasing 10:9427d4d5af81 "J" (tip) |
348 note: rebase of 10:9427d4d5af81 created no changes to commit | |
349 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-c2111e9d-backup.hg (glob) | 344 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-c2111e9d-backup.hg (glob) |
350 | 345 |
351 $ hg tglog | 346 $ hg tglog |
352 @ 8: 'Collapsed revision | 347 @ 8: 'Collapsed revision |
353 | * I | 348 | * I |