Mercurial > hg-stable

comparison tests/test-rebase-named-branches.t @ 14119:624e5ce615ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: upgrade bundles/rebase.hg to support test-rebase-collapse Add two changesets to the scenario so that the bundle can be reused within three tests. Before: @ 5: 'F' | | o 4: 'E' |/| o | 3: 'D | | | o 2: 'C' |/ | o 1: 'B' |/ o 0: 'A' After: @ 7: 'H' | | o 6: 'G' |/| o | 5: 'F' | | | o 4: 'E' |/ | o 3: 'D' | | | o 2: 'C' | | | o 1: 'B' |/ o 0: 'A' Revisions 0-1 keep the same number/label. Others were translated by an offset of 2 (2.C -> 4.E)
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sat, 30 Apr 2011 17:38:06 +0200
parents 7fd8e597f99c
children d7f80dbbaf49
comparison
equal deleted inserted replaced
14118:7fd8e597f99c 14119:624e5ce615ec
11 $ cd a 11 $ cd a
12 $ hg unbundle $TESTDIR/bundles/rebase.hg 12 $ hg unbundle $TESTDIR/bundles/rebase.hg
13 adding changesets 13 adding changesets
14 adding manifests 14 adding manifests
15 adding file changes 15 adding file changes
16 added 6 changesets with 5 changes to 5 files (+2 heads) 16 added 8 changesets with 7 changes to 7 files (+2 heads)
17 (run 'hg heads' to see heads, 'hg merge' to merge) 17 (run 'hg heads' to see heads, 'hg merge' to merge)
18 $ hg up tip 18 $ hg up tip
19 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 19 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
20 $ cd .. 20 $ cd ..
21 21
34 $ hg add x 34 $ hg add x
35 35
36 $ hg ci -m 'extra named branch' 36 $ hg ci -m 'extra named branch'
37 37
38 $ hg tglog 38 $ hg tglog
39 @ 6: 'extra named branch' dev 39 @ 8: 'extra named branch' dev
40 | 40 |
41 o 5: 'F' 41 o 7: 'H'
42 | 42 |
43 | o 6: 'G'
44 |/|
45 o | 5: 'F'
46 | |
43 | o 4: 'E' 47 | o 4: 'E'
44 |/| 48 |/
45 o | 3: 'D' 49 | o 3: 'D'
46 | | 50 | |
47 | o 2: 'C' 51 | o 2: 'C'
48 |/ 52 | |
49 | o 1: 'B' 53 | o 1: 'B'
50 |/ 54 |/
51 o 0: 'A' 55 o 0: 'A'
52 56
53 $ hg rebase -s 6 -d 5 57 $ hg rebase -s 8 -d 7
54 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) 58 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
55 59
56 $ hg tglog 60 $ hg tglog
57 @ 6: 'extra named branch' 61 @ 8: 'extra named branch'
58 | 62 |
59 o 5: 'F' 63 o 7: 'H'
60 | 64 |
65 | o 6: 'G'
66 |/|
67 o | 5: 'F'
68 | |
61 | o 4: 'E' 69 | o 4: 'E'
62 |/| 70 |/
63 o | 3: 'D' 71 | o 3: 'D'
64 | | 72 | |
65 | o 2: 'C' 73 | o 2: 'C'
66 |/ 74 | |
67 | o 1: 'B' 75 | o 1: 'B'
68 |/ 76 |/
69 o 0: 'A' 77 o 0: 'A'
70 78
71 $ cd .. 79 $ cd ..
74 82
75 $ hg clone -q -u . a a2 83 $ hg clone -q -u . a a2
76 84
77 $ cd a2 85 $ cd a2
78 86
79 $ echo x > x 87 $ echo I > I
80 88
81 $ hg add x 89 $ hg ci -AmI
82 90 adding I
83 $ hg ci -m 'G'
84 91
85 $ hg tglog 92 $ hg tglog
86 @ 6: 'G' 93 @ 8: 'I'
87 | 94 |
88 o 5: 'F' 95 o 7: 'H'
89 | 96 |
97 | o 6: 'G'
98 |/|
99 o | 5: 'F'
100 | |
90 | o 4: 'E' 101 | o 4: 'E'
91 |/| 102 |/
92 o | 3: 'D' 103 | o 3: 'D'
93 | | 104 | |
94 | o 2: 'C' 105 | o 2: 'C'
95 |/ 106 | |
96 | o 1: 'B' 107 | o 1: 'B'
97 |/ 108 |/
98 o 0: 'A' 109 o 0: 'A'
99 110
100 $ hg rebase -s 6 -d 5 111 $ hg rebase -s 8 -d 7
101 abort: source is descendant of destination 112 abort: source is descendant of destination
102 [255] 113 [255]
103 114
104 $ cd .. 115 $ cd ..
105 116
117 $ hg add x 128 $ hg add x
118 129
119 $ hg ci -m 'extra named branch' 130 $ hg ci -m 'extra named branch'
120 131
121 $ hg tglog 132 $ hg tglog
122 @ 6: 'extra named branch' dev 133 @ 8: 'extra named branch' dev
123 | 134 |
124 o 5: 'F' 135 o 7: 'H'
125 | 136 |
137 | o 6: 'G'
138 |/|
139 o | 5: 'F'
140 | |
126 | o 4: 'E' 141 | o 4: 'E'
127 |/| 142 |/
128 o | 3: 'D' 143 | o 3: 'D'
129 | | 144 | |
130 | o 2: 'C' 145 | o 2: 'C'
131 |/ 146 | |
132 | o 1: 'B' 147 | o 1: 'B'
133 |/ 148 |/
134 o 0: 'A' 149 o 0: 'A'
135 150
136 $ hg rebase -s 5 -d 6 151 $ hg rebase -s 7 -d 8
137 abort: source is ancestor of destination 152 abort: source is ancestor of destination
138 [255] 153 [255]
139 154
140 $ cd .. 155 $ cd ..
141 156