Mercurial > hg

comparison tests/test-rebase-bookmarks.t @ 18514:2a1fac3650a5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: delete divergent bookmarks on destination (issue3685) Similar to merge, divergent bookmarks are only deleted when the bookmark is on the destination parent.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 30 Jan 2013 16:08:32 -0800
parents 2944a6d35158
children 12de53323e59
comparison
equal deleted inserted replaced
18513:37ce336ab2dd 18514:2a1fac3650a5
54 $ hg clone -q a a1 54 $ hg clone -q a a1
55 55
56 $ cd a1 56 $ cd a1
57 $ hg up -q Z 57 $ hg up -q Z
58 58
59 Test deleting divergent bookmarks from dest (issue3685)
60
61 $ hg book -r 3 Z@diverge
62
63 ... and also test that bookmarks not on dest or not being moved aren't deleted
64
65 $ hg book -r 3 X@diverge
66 $ hg book -r 0 Y@diverge
67
68 $ hg tglog
69 o 3: 'D' bookmarks: W X@diverge Z@diverge
70 |
71 | @ 2: 'C' bookmarks: Y Z
72 | |
73 | o 1: 'B' bookmarks: X
74 |/
75 o 0: 'A' bookmarks: Y@diverge
76
59 $ hg rebase -s Y -d 3 77 $ hg rebase -s Y -d 3
60 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) 78 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
61 79
62 $ hg tglog 80 $ hg tglog
63 @ 3: 'C' bookmarks: Y Z 81 @ 3: 'C' bookmarks: Y Z
64 | 82 |
65 o 2: 'D' bookmarks: W 83 o 2: 'D' bookmarks: W X@diverge
66 | 84 |
67 | o 1: 'B' bookmarks: X 85 | o 1: 'B' bookmarks: X
68 |/ 86 |/
69 o 0: 'A' bookmarks: 87 o 0: 'A' bookmarks: Y@diverge
70 88
71 Keep bookmarks to the correct rebased changeset 89 Keep bookmarks to the correct rebased changeset
72 90
73 $ cd .. 91 $ cd ..
74 $ hg clone -q a a2 92 $ hg clone -q a a2