20 (run 'hg heads' to see heads, 'hg merge' to merge) |
20 (run 'hg heads' to see heads, 'hg merge' to merge) |
21 $ hg up tip |
21 $ hg up tip |
22 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
22 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
23 $ cd .. |
23 $ cd .. |
24 |
24 |
|
25 $ hg clone -q -u . a a1 |
|
26 |
|
27 $ cd a1 |
|
28 |
|
29 $ hg update 3 |
|
30 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
31 $ hg branch dev-one |
|
32 marked working directory as branch dev-one |
|
33 (branches are permanent and global, did you want a bookmark?) |
|
34 $ hg ci -m 'dev-one named branch' |
|
35 |
|
36 $ hg update 7 |
|
37 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
38 $ hg branch dev-two |
|
39 marked working directory as branch dev-two |
|
40 (branches are permanent and global, did you want a bookmark?) |
|
41 |
|
42 $ echo x > x |
|
43 |
|
44 $ hg add x |
|
45 |
|
46 $ hg ci -m 'dev-two named branch' |
|
47 |
|
48 $ hg tglog |
|
49 @ 9: 'dev-two named branch' dev-two |
|
50 | |
|
51 | o 8: 'dev-one named branch' dev-one |
|
52 | | |
|
53 o | 7: 'H' |
|
54 | | |
|
55 +---o 6: 'G' |
|
56 | | | |
|
57 o | | 5: 'F' |
|
58 | | | |
|
59 +---o 4: 'E' |
|
60 | | |
|
61 | o 3: 'D' |
|
62 | | |
|
63 | o 2: 'C' |
|
64 | | |
|
65 | o 1: 'B' |
|
66 |/ |
|
67 o 0: 'A' |
|
68 |
|
69 |
|
70 Branch name containing a dash (issue3181) |
|
71 |
|
72 $ hg rebase -b dev-two -d dev-one --keepbranches |
|
73 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
74 |
|
75 $ hg tglog |
|
76 @ 9: 'dev-two named branch' dev-two |
|
77 | |
|
78 o 8: 'H' |
|
79 | |
|
80 | o 7: 'G' |
|
81 |/| |
|
82 o | 6: 'F' |
|
83 | | |
|
84 o | 5: 'dev-one named branch' dev-one |
|
85 | | |
|
86 | o 4: 'E' |
|
87 | | |
|
88 o | 3: 'D' |
|
89 | | |
|
90 o | 2: 'C' |
|
91 | | |
|
92 o | 1: 'B' |
|
93 |/ |
|
94 o 0: 'A' |
|
95 |
|
96 $ hg rebase -s dev-one -d 0 --keepbranches |
|
97 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
98 |
|
99 $ hg tglog |
|
100 @ 8: 'dev-two named branch' dev-two |
|
101 | |
|
102 o 7: 'H' |
|
103 | |
|
104 | o 6: 'G' |
|
105 |/| |
|
106 o | 5: 'F' |
|
107 | | |
|
108 | o 4: 'E' |
|
109 |/ |
|
110 | o 3: 'D' |
|
111 | | |
|
112 | o 2: 'C' |
|
113 | | |
|
114 | o 1: 'B' |
|
115 |/ |
|
116 o 0: 'A' |
|
117 |
|
118 $ hg update 3 |
|
119 3 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
120 $ hg branch dev-one |
|
121 marked working directory as branch dev-one |
|
122 (branches are permanent and global, did you want a bookmark?) |
|
123 $ hg ci -m 'dev-one named branch' |
|
124 |
|
125 $ hg tglog |
|
126 @ 9: 'dev-one named branch' dev-one |
|
127 | |
|
128 | o 8: 'dev-two named branch' dev-two |
|
129 | | |
|
130 | o 7: 'H' |
|
131 | | |
|
132 | | o 6: 'G' |
|
133 | |/| |
|
134 | o | 5: 'F' |
|
135 | | | |
|
136 | | o 4: 'E' |
|
137 | |/ |
|
138 o | 3: 'D' |
|
139 | | |
|
140 o | 2: 'C' |
|
141 | | |
|
142 o | 1: 'B' |
|
143 |/ |
|
144 o 0: 'A' |
|
145 |
|
146 $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches |
|
147 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
148 |
|
149 $ hg tglog |
|
150 @ 9: 'dev-two named branch' dev-two |
|
151 | |
|
152 o 8: 'H' |
|
153 | |
|
154 | o 7: 'G' |
|
155 |/| |
|
156 o | 6: 'F' |
|
157 | | |
|
158 o | 5: 'dev-one named branch' dev-one |
|
159 | | |
|
160 | o 4: 'E' |
|
161 | | |
|
162 o | 3: 'D' |
|
163 | | |
|
164 o | 2: 'C' |
|
165 | | |
|
166 o | 1: 'B' |
|
167 |/ |
|
168 o 0: 'A' |
|
169 |
|
170 $ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches |
|
171 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
172 |
|
173 $ hg tglog |
|
174 @ 8: 'dev-two named branch' dev-two |
|
175 | |
|
176 o 7: 'H' |
|
177 | |
|
178 | o 6: 'G' |
|
179 |/| |
|
180 o | 5: 'F' |
|
181 | | |
|
182 | o 4: 'E' |
|
183 |/ |
|
184 | o 3: 'D' |
|
185 | | |
|
186 | o 2: 'C' |
|
187 | | |
|
188 | o 1: 'B' |
|
189 |/ |
|
190 o 0: 'A' |
|
191 |
25 |
192 |
26 Rebasing descendant onto ancestor across different named branches |
193 Rebasing descendant onto ancestor across different named branches |
27 |
194 |
28 $ hg clone -q -u . a a1 |
|
29 |
|
30 $ cd a1 |
|
31 |
|
32 $ hg branch dev |
|
33 marked working directory as branch dev |
|
34 (branches are permanent and global, did you want a bookmark?) |
|
35 |
|
36 $ echo x > x |
|
37 |
|
38 $ hg add x |
|
39 |
|
40 $ hg ci -m 'extra named branch' |
|
41 |
|
42 $ hg tglog |
|
43 @ 8: 'extra named branch' dev |
|
44 | |
|
45 o 7: 'H' |
|
46 | |
|
47 | o 6: 'G' |
|
48 |/| |
|
49 o | 5: 'F' |
|
50 | | |
|
51 | o 4: 'E' |
|
52 |/ |
|
53 | o 3: 'D' |
|
54 | | |
|
55 | o 2: 'C' |
|
56 | | |
|
57 | o 1: 'B' |
|
58 |/ |
|
59 o 0: 'A' |
|
60 |
|
61 |
|
62 |
|
63 $ hg rebase -s 1 -d 8 --keepbranches |
195 $ hg rebase -s 1 -d 8 --keepbranches |
64 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
196 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
65 |
197 |
66 $ hg tglog |
198 $ hg tglog |
67 @ 8: 'D' |
199 @ 8: 'D' |
68 | |
200 | |
69 o 7: 'C' |
201 o 7: 'C' |
70 | |
202 | |
71 o 6: 'B' |
203 o 6: 'B' |
72 | |
204 | |
73 o 5: 'extra named branch' dev |
205 o 5: 'dev-two named branch' dev-two |
74 | |
206 | |
75 o 4: 'H' |
207 o 4: 'H' |
76 | |
208 | |
77 | o 3: 'G' |
209 | o 3: 'G' |
78 |/| |
210 |/| |