diff options
Diffstat (limited to 'tests/test-rebase-bookmarks.t')
| -rw-r--r-- | tests/test-rebase-bookmarks.t | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t index fe5a251..4186be9 100644 --- a/tests/test-rebase-bookmarks.t +++ b/tests/test-rebase-bookmarks.t @@ -3,9 +3,6 @@ > graphlog= > rebase= > - > [phases] - > publish=False - > > [alias] > tglog = log -G --template "{rev}: '{desc}' bookmarks: {bookmarks}\n" > EOF @@ -36,10 +33,8 @@ Create a repo with several bookmarks adding d created new head - $ hg book W - $ hg tglog - @ 3: 'D' bookmarks: W + @ 3: 'D' bookmarks: | | o 2: 'C' bookmarks: Y Z | | @@ -56,13 +51,13 @@ Move only rebased bookmarks $ cd a1 $ hg up -q Z - $ hg rebase -s Y -d 3 + $ hg rebase --detach -s Y -d 3 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) $ hg tglog @ 3: 'C' bookmarks: Y Z | - o 2: 'D' bookmarks: W + o 2: 'D' bookmarks: | | o 1: 'B' bookmarks: X |/ @@ -84,30 +79,7 @@ Keep bookmarks to the correct rebased changeset | o 2: 'B' bookmarks: X | - o 1: 'D' bookmarks: W + o 1: 'D' bookmarks: | o 0: 'A' bookmarks: - -Keep active bookmark on the correct changeset - - $ cd .. - $ hg clone -q a a3 - - $ cd a3 - $ hg up -q X - - $ hg rebase -d W - saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) - - $ hg tglog - @ 3: 'C' bookmarks: Y Z - | - o 2: 'B' bookmarks: X - | - o 1: 'D' bookmarks: W - | - o 0: 'A' bookmarks: - - - $ cd .. |