Core hg rev 4f969b9e (https://phab.mercurial-scm.org/D741) altered the output order.
Diff Detail
Diff Detail
- Lint
Lint Skipped - Unit
Unit Tests Skipped
This is an archive of the discontinued Mercurial Phabricator instance.
Differential D830
tests: re-order tags and bookmarks in tracking testAbandonedPublic
tests: re-order tags and bookmarks in tracking test
AbandonedPublic
Authored by mjpieters on Sep 28 2017, 9:33 AM.
Revision Contents
Revision Contents
Diff 2138
Diff 2138
tests/test-tracking.t
| | o 1 a2 a | | o 1 a2 a | ||||
| |/ | |/ | ||||
| o 0 a1 | o 0 a1 | ||||
| $ hg book -v | $ hg book -v | ||||
| a 1:fdceb0e57656 | a 1:fdceb0e57656 | ||||
| * b 2:dea4e1d2ca0e [a: 1 ahead, 1 behind] | * b 2:dea4e1d2ca0e [a: 1 ahead, 1 behind] | ||||
| $ hg rebase --tool :fail | $ hg rebase --tool :fail | ||||
| rebasing 2:dea4e1d2ca0e "b" (tip b) | rebasing 2:dea4e1d2ca0e "b" (b tip) | ||||
| unresolved conflicts (see hg resolve, then hg rebase --continue) | unresolved conflicts (see hg resolve, then hg rebase --continue) | ||||
| [1] | [1] | ||||
| $ echo aa > a | $ echo aa > a | ||||
| $ hg resolve --mark a 2>&1 | grep -v "^continue:" | $ hg resolve --mark a 2>&1 | grep -v "^continue:" | ||||
| (no more unresolved files) | (no more unresolved files) | ||||
| $ hg rebase --continue | $ hg rebase --continue | ||||
| rebasing 2:dea4e1d2ca0e "b" (tip b) | rebasing 2:dea4e1d2ca0e "b" (b tip) | ||||
| saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/dea4e1d2ca0e-a7f1cee1-*.hg (glob) | saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/dea4e1d2ca0e-a7f1cee1-*.hg (glob) | ||||
| $ hg log -G -T '{rev} {desc} {bookmarks} {remotebookmarks}' | $ hg log -G -T '{rev} {desc} {bookmarks} {remotebookmarks}' | ||||
| @ 2 b b | @ 2 b b | ||||
| | | | | ||||
| o 1 a2 a | o 1 a2 a | ||||
| | | | | ||||
| o 0 a1 | o 0 a1 | ||||
| |/ | |/ | ||||
| o 1 fdceb0e57656 | o 1 fdceb0e57656 | ||||
| | | | | ||||
| o 0 07199ae38cd5 | o 0 07199ae38cd5 | ||||
| $ hg bookmarks -v | $ hg bookmarks -v | ||||
| * c 5:ff58066d17c3 [remote/a: 1 ahead, 2 behind] | * c 5:ff58066d17c3 [remote/a: 1 ahead, 2 behind] | ||||
| $ hg rebase | $ hg rebase | ||||
| rebasing 5:ff58066d17c3 "d" (tip c) | rebasing 5:ff58066d17c3 "d" (c tip) | ||||
| saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/ff58066d17c3-470dd0be-*.hg (glob) | saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/ff58066d17c3-470dd0be-*.hg (glob) | ||||
| $ hg log -G -T '{rev} {node|short} {bookmarks} {remotebookmarks}\n' | $ hg log -G -T '{rev} {node|short} {bookmarks} {remotebookmarks}\n' | ||||
| @ 5 8d13dc14fef1 c | @ 5 8d13dc14fef1 c | ||||
| | | | | ||||
| | o 4 364e447d28f4 | | o 4 364e447d28f4 | ||||
| | | | | | | ||||
| o | 3 e305ab9fea99 remote/a remote/b | o | 3 e305ab9fea99 remote/a remote/b | ||||
| | | | | | | ||||