mercurial: comparison tests/test-rebase-detach.t

equal deleted inserted replaced

-:c23c62209cc4
+:9c78ed396075
 $ hg phase --force --secret 3
 $ hg rebase -s 3 -d 7
 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
-@  7:secret 'D'
+o  7:secret 'D'
 |
-o  6:draft 'H'
+@  6:draft 'H'
 |
 | o  5:draft 'G'
 |/|
 o |  4:draft 'F'
 | |
 $ hg rebase -s 2 -d 7
 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
 $ hg tglog
-@  7: 'D'
+o  7: 'D'
 |
 o  6: 'C'
 |
-o  5: 'H'
+@  5: 'H'
 |
 | o  4: 'G'
 |/|
 o |  3: 'F'
 | |
 $ hg rebase -s 1 -d 7
 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
 $ hg tglog
-@  7: 'D'
+o  7: 'D'
 |
 o  6: 'C'
 |
 o  5: 'B'
 |
-o  4: 'H'
+@  4: 'H'
 |
 | o  3: 'G'
 |/|
 o |  2: 'F'
 | |
 $ hg rebase --collapse -s 2 -d 7
 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
 $ hg  log -G --template "{rev}:{phase} '{desc}' {branches}\n"
-@  6:secret 'Collapsed revision
+o  6:secret 'Collapsed revision
 |  * C
 |  * D'
-o  5:draft 'H'
+@  5:draft 'H'
 |
 | o  4:draft 'G'
 |/|
 o |  3:draft 'F'
 | |
 $ hg rebase -s 1 -d tip
 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
 $ hg tglog
-@  8: 'D'
+o  8: 'D'
 |
 o  7: 'C'
 |
 o  6: 'B'
 |
-o  5: 'extra branch'
+@  5: 'extra branch'
 o  4: 'H'
 |
 | o  3: 'G'
 |/|
 $ hg rebase -d 5 -s 7
 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob)
 $ hg tglog
-@  8: 'D'
+o  8: 'D'
 |
 o  7: 'C'
 |
 | o  6: 'B'
 |/
-o  5: 'extra branch'
+@  5: 'extra branch'
 o  4: 'H'
 |
 | o  3: 'G'
 |/|
 $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other
 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
 $ hg tglog
-@  8: 'Collapsed revision
+o  8: 'Collapsed revision
 |  * I
 |  * Merge
 |  * J'
-o  7: 'H'
+@  7: 'H'
 |
 | o  6: 'G'
 |/|
 o |  5: 'F'
 | |

changeset 19925	9c78ed396075
parent 19924	c23c62209cc4
child 19986	ea81f8b2364e