equal
deleted
inserted
replaced
46 | o 1: 'B' |
46 | o 1: 'B' |
47 |/ |
47 |/ |
48 o 0: 'A' |
48 o 0: 'A' |
49 |
49 |
50 $ hg phase --force --secret 3 |
50 $ hg phase --force --secret 3 |
51 $ hg rebase --detach -s 3 -d 7 |
51 $ hg rebase -s 3 -d 7 |
52 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
52 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
53 |
53 |
54 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
54 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
55 @ 7:secret 'D' |
55 @ 7:secret 'D' |
56 | |
56 | |
97 | | |
97 | | |
98 | o 1: 'B' |
98 | o 1: 'B' |
99 |/ |
99 |/ |
100 o 0: 'A' |
100 o 0: 'A' |
101 |
101 |
102 $ hg rebase --detach -s 2 -d 7 |
102 $ hg rebase -s 2 -d 7 |
103 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
103 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
104 |
104 |
105 $ hg tglog |
105 $ hg tglog |
106 @ 7: 'D' |
106 @ 7: 'D' |
107 | |
107 | |
149 | | |
149 | | |
150 | o 1: 'B' |
150 | o 1: 'B' |
151 |/ |
151 |/ |
152 o 0: 'A' |
152 o 0: 'A' |
153 |
153 |
154 $ hg rebase --detach -s 1 -d 7 |
154 $ hg rebase -s 1 -d 7 |
155 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
155 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
156 |
156 |
157 $ hg tglog |
157 $ hg tglog |
158 @ 7: 'D' |
158 @ 7: 'D' |
159 | |
159 | |
203 | | |
203 | | |
204 | o 1: 'B' |
204 | o 1: 'B' |
205 |/ |
205 |/ |
206 o 0: 'A' |
206 o 0: 'A' |
207 |
207 |
208 $ hg rebase --detach --collapse -s 2 -d 7 |
208 $ hg rebase --collapse -s 2 -d 7 |
209 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) |
209 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) |
210 |
210 |
211 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
211 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
212 @ 6:secret 'Collapsed revision |
212 @ 6:secret 'Collapsed revision |
213 | * C |
213 | * C |
262 | | |
262 | | |
263 | o 1: 'B' |
263 | o 1: 'B' |
264 |/ |
264 |/ |
265 o 0: 'A' |
265 o 0: 'A' |
266 |
266 |
267 $ hg rebase --detach -s 1 -d tip |
267 $ hg rebase -s 1 -d tip |
268 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) |
268 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) |
269 |
269 |
270 $ hg tglog |
270 $ hg tglog |
271 @ 8: 'D' |
271 @ 8: 'D' |
272 | |
272 | |
323 (branch merge, don't forget to commit) |
323 (branch merge, don't forget to commit) |
324 $ hg ci -m "Merge" |
324 $ hg ci -m "Merge" |
325 $ echo "J" >> F |
325 $ echo "J" >> F |
326 $ hg ci -m "J" |
326 $ hg ci -m "J" |
327 |
327 |
328 $ hg rebase -s 8 -d 7 --collapse --detach --config ui.merge=internal:other |
328 $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other |
329 remote changed E which local deleted |
329 remote changed E which local deleted |
330 use (c)hanged version or leave (d)eleted? c |
330 use (c)hanged version or leave (d)eleted? c |
331 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) |
331 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) |
332 |
332 |
333 $ hg tglog |
333 $ hg tglog |
368 $ hg up -q 3 |
368 $ hg up -q 3 |
369 $ echo 'H2' > H |
369 $ echo 'H2' > H |
370 $ hg ci -A -m 'H2' |
370 $ hg ci -A -m 'H2' |
371 adding H |
371 adding H |
372 $ hg phase --force --secret 8 |
372 $ hg phase --force --secret 8 |
373 $ hg rebase -s 8 -d 7 --detach --config ui.merge=internal:fail |
373 $ hg rebase -s 8 -d 7 --config ui.merge=internal:fail |
374 merging H |
374 merging H |
375 warning: conflicts during merge. |
375 warning: conflicts during merge. |
376 merging H incomplete! (edit conflicts, then use 'hg resolve --mark') |
376 merging H incomplete! (edit conflicts, then use 'hg resolve --mark') |
377 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
377 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
378 [255] |
378 [255] |