equal
deleted
inserted
replaced
103 4: 'C' branch2 |
103 4: 'C' branch2 |
104 2: 'B' branch1 |
104 2: 'B' branch1 |
105 0: 'A' |
105 0: 'A' |
106 |
106 |
107 $ hg rebase -s 5 -d 8 |
107 $ hg rebase -s 5 -d 8 |
108 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
108 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-backup.hg (glob) |
109 |
109 |
110 $ hg branches |
110 $ hg branches |
111 branch3 8:466cdfb14b62 |
111 branch3 8:466cdfb14b62 |
112 branch2 4:e4fdb121d036 |
112 branch2 4:e4fdb121d036 |
113 branch1 2:0a03079c47fd |
113 branch1 2:0a03079c47fd |
164 | o 1: 'branch1' branch1 |
164 | o 1: 'branch1' branch1 |
165 |/ |
165 |/ |
166 o 0: 'A' |
166 o 0: 'A' |
167 |
167 |
168 $ hg rebase -s 8 -d 6 |
168 $ hg rebase -s 8 -d 6 |
169 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
169 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-backup.hg (glob) |
170 |
170 |
171 $ hg branches |
171 $ hg branches |
172 branch2 8:6b4bdc1b5ac0 |
172 branch2 8:6b4bdc1b5ac0 |
173 branch3 7:653b9feb4616 |
173 branch3 7:653b9feb4616 |
174 branch1 2:0a03079c47fd (inactive) |
174 branch1 2:0a03079c47fd (inactive) |
228 | o 1: 'branch1' branch1 |
228 | o 1: 'branch1' branch1 |
229 |/ |
229 |/ |
230 o 0: 'A' |
230 o 0: 'A' |
231 |
231 |
232 $ hg rebase -s 7 -d 6 |
232 $ hg rebase -s 7 -d 6 |
233 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
233 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-backup.hg (glob) |
234 |
234 |
235 $ hg branches |
235 $ hg branches |
236 branch2 7:6b4bdc1b5ac0 |
236 branch2 7:6b4bdc1b5ac0 |
237 branch1 2:0a03079c47fd (inactive) |
237 branch1 2:0a03079c47fd (inactive) |
238 default 0:1994f17a630e (inactive) |
238 default 0:1994f17a630e (inactive) |
265 Stripping multiple branches in one go bypasses the fast-case code to |
265 Stripping multiple branches in one go bypasses the fast-case code to |
266 update the branch cache. |
266 update the branch cache. |
267 |
267 |
268 $ hg strip 2 |
268 $ hg strip 2 |
269 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
269 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
270 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
270 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-backup.hg (glob) |
271 |
271 |
272 $ hg tglog |
272 $ hg tglog |
273 o 3: 'C' branch2 |
273 o 3: 'C' branch2 |
274 | |
274 | |
275 o 2: 'branch2' branch2 |
275 o 2: 'branch2' branch2 |
326 2: 'A' branch1 |
326 2: 'A' branch1 |
327 1: 'branch2' branch2 |
327 1: 'branch2' branch2 |
328 |
328 |
329 $ hg strip 2 |
329 $ hg strip 2 |
330 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
330 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
331 saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/*-backup.hg (glob) |
331 saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-backup.hg (glob) |
332 |
332 |
333 $ hg theads |
333 $ hg theads |
334 1: 'branch2' branch2 |
334 1: 'branch2' branch2 |
335 0: 'branch1' branch1 |
335 0: 'branch1' branch1 |
336 |
336 |
371 o 0: 'A' |
371 o 0: 'A' |
372 |
372 |
373 |
373 |
374 $ hg strip 3 4 |
374 $ hg strip 3 4 |
375 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
375 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
376 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/*-backup.hg (glob) |
376 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-backup.hg (glob) |
377 |
377 |
378 $ hg theads |
378 $ hg theads |
379 2: 'C' |
379 2: 'C' |
380 |
380 |
381 $ hg strip 2 1 |
381 $ hg strip 2 1 |
382 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
382 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
383 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/*-backup.hg (glob) |
383 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-backup.hg (glob) |
384 |
384 |
385 $ hg theads |
385 $ hg theads |
386 0: 'A' |
386 0: 'A' |
387 |
387 |
388 Make sure rebase does not break for phase/filter related reason |
388 Make sure rebase does not break for phase/filter related reason |
475 > true |
475 > true |
476 > EOF |
476 > EOF |
477 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e |
477 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e |
478 HGEDITFORM=rebase.merge |
478 HGEDITFORM=rebase.merge |
479 HGEDITFORM=rebase.normal |
479 HGEDITFORM=rebase.normal |
480 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/*-backup.hg (glob) |
480 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-backup.hg (glob) |