equal
deleted
inserted
replaced
6 > [phases] |
6 > [phases] |
7 > publish=False |
7 > publish=False |
8 > |
8 > |
9 > [alias] |
9 > [alias] |
10 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
10 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
|
11 > tglogp = log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
11 > EOF |
12 > EOF |
12 |
13 |
13 |
14 |
14 $ hg init a |
15 $ hg init a |
15 $ cd a |
16 $ cd a |
69 |
70 |
70 $ echo 'Extra' > Extra |
71 $ echo 'Extra' > Extra |
71 $ hg add Extra |
72 $ hg add Extra |
72 $ hg ci -m 'Extra' |
73 $ hg ci -m 'Extra' |
73 |
74 |
74 $ hg tglog |
75 Force this commit onto secret phase |
75 @ 6: 'Extra' |
76 |
76 | |
77 $ hg phase --force --secret 6 |
77 | o 5: 'B' |
78 |
78 | | |
79 $ hg tglogp |
79 | o 4: 'E' |
80 @ 6:secret 'Extra' |
80 | | |
81 | |
81 | o 3: 'D' |
82 | o 5:draft 'B' |
82 | | |
83 | | |
83 o | 2: 'C' |
84 | o 4:draft 'E' |
84 | | |
85 | | |
85 o | 1: 'B' |
86 | o 3:draft 'D' |
86 |/ |
87 | | |
87 o 0: 'A' |
88 o | 2:draft 'C' |
|
89 | | |
|
90 o | 1:draft 'B' |
|
91 |/ |
|
92 o 0:draft 'A' |
88 |
93 |
89 Resume the rebasing: |
94 Resume the rebasing: |
90 |
95 |
91 $ hg rebase --continue |
96 $ hg rebase --continue |
92 merging A |
97 merging A |
102 $ hg resolve -m A |
107 $ hg resolve -m A |
103 |
108 |
104 $ hg rebase --continue |
109 $ hg rebase --continue |
105 warning: new changesets detected on source branch, not stripping |
110 warning: new changesets detected on source branch, not stripping |
106 |
111 |
107 $ hg tglog |
112 $ hg tglogp |
108 @ 7: 'C' |
113 @ 7:draft 'C' |
109 | |
114 | |
110 | o 6: 'Extra' |
115 | o 6:secret 'Extra' |
111 | | |
116 | | |
112 o | 5: 'B' |
117 o | 5:draft 'B' |
113 | | |
118 | | |
114 o | 4: 'E' |
119 o | 4:draft 'E' |
115 | | |
120 | | |
116 o | 3: 'D' |
121 o | 3:draft 'D' |
117 | | |
122 | | |
118 | o 2: 'C' |
123 | o 2:draft 'C' |
119 | | |
124 | | |
120 | o 1: 'B' |
125 | o 1:draft 'B' |
121 |/ |
126 |/ |
122 o 0: 'A' |
127 o 0:draft 'A' |
123 |
128 |
124 $ cd .. |
129 $ cd .. |
125 |
130 |
126 |
131 |
127 Changes during an interruption - abort: |
132 Changes during an interruption - abort: |
193 |/ |
198 |/ |
194 o 0: 'A' |
199 o 0: 'A' |
195 |
200 |
196 $ cd .. |
201 $ cd .. |
197 |
202 |
|
203 Changes during an interruption - abort (again): |
|
204 |
|
205 $ hg clone -q -u . a a3 |
|
206 $ cd a3 |
|
207 |
|
208 $ hg tglogp |
|
209 @ 4:draft 'E' |
|
210 | |
|
211 o 3:draft 'D' |
|
212 | |
|
213 | o 2:draft 'C' |
|
214 | | |
|
215 | o 1:draft 'B' |
|
216 |/ |
|
217 o 0:draft 'A' |
|
218 |
|
219 Rebasing B onto E: |
|
220 |
|
221 $ hg rebase -s 1 -d 4 |
|
222 merging A |
|
223 warning: conflicts during merge. |
|
224 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
225 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
226 [255] |
|
227 |
|
228 Change phase on B and B' |
|
229 |
|
230 $ hg up -q -C 5 |
|
231 $ hg phase --public 1 |
|
232 $ hg phase --public 5 |
|
233 $ hg phase --secret -f 2 |
|
234 |
|
235 $ hg tglogp |
|
236 @ 5:public 'B' |
|
237 | |
|
238 o 4:public 'E' |
|
239 | |
|
240 o 3:public 'D' |
|
241 | |
|
242 | o 2:secret 'C' |
|
243 | | |
|
244 | o 1:public 'B' |
|
245 |/ |
|
246 o 0:public 'A' |
|
247 |
|
248 Abort the rebasing: |
|
249 |
|
250 $ hg rebase --abort |
|
251 warning: immutable rebased changeset detected, can't abort |
|
252 [255] |
|
253 |
|
254 $ hg tglogp |
|
255 @ 5:public 'B' |
|
256 | |
|
257 o 4:public 'E' |
|
258 | |
|
259 o 3:public 'D' |
|
260 | |
|
261 | o 2:secret 'C' |
|
262 | | |
|
263 | o 1:public 'B' |
|
264 |/ |
|
265 o 0:public 'A' |
|
266 |
|
267 $ cd .. |