equal
deleted
inserted
replaced
105 0: 'A' |
105 0: 'A' |
106 |
106 |
107 $ hg rebase -s 5 -d 8 |
107 $ hg rebase -s 5 -d 8 |
108 rebasing 5:635859577d0b "D" |
108 rebasing 5:635859577d0b "D" |
109 rebasing 6:5097051d331d "E" |
109 rebasing 6:5097051d331d "E" |
110 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-backup.hg (glob) |
110 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-89160bff-backup.hg (glob) |
111 |
111 |
112 $ hg branches |
112 $ hg branches |
113 branch3 8:466cdfb14b62 |
113 branch3 8:466cdfb14b62 |
114 branch2 4:e4fdb121d036 |
114 branch2 4:e4fdb121d036 |
115 branch1 2:0a03079c47fd |
115 branch1 2:0a03079c47fd |
167 |/ |
167 |/ |
168 o 0: 'A' |
168 o 0: 'A' |
169 |
169 |
170 $ hg rebase -s 8 -d 6 |
170 $ hg rebase -s 8 -d 6 |
171 rebasing 8:4666b71e8e32 "F" (tip) |
171 rebasing 8:4666b71e8e32 "F" (tip) |
172 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-backup.hg (glob) |
172 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-backup.hg (glob) |
173 |
173 |
174 $ hg branches |
174 $ hg branches |
175 branch2 8:6b4bdc1b5ac0 |
175 branch2 8:6b4bdc1b5ac0 |
176 branch3 7:653b9feb4616 |
176 branch3 7:653b9feb4616 |
177 branch1 2:0a03079c47fd (inactive) |
177 branch1 2:0a03079c47fd (inactive) |
234 |
234 |
235 $ hg rebase -s 7 -d 6 |
235 $ hg rebase -s 7 -d 6 |
236 rebasing 7:653b9feb4616 "branch3" |
236 rebasing 7:653b9feb4616 "branch3" |
237 note: rebase of 7:653b9feb4616 created no changes to commit |
237 note: rebase of 7:653b9feb4616 created no changes to commit |
238 rebasing 8:4666b71e8e32 "F" (tip) |
238 rebasing 8:4666b71e8e32 "F" (tip) |
239 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-backup.hg (glob) |
239 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-backup.hg (glob) |
240 |
240 |
241 $ hg branches |
241 $ hg branches |
242 branch2 7:6b4bdc1b5ac0 |
242 branch2 7:6b4bdc1b5ac0 |
243 branch1 2:0a03079c47fd (inactive) |
243 branch1 2:0a03079c47fd (inactive) |
244 default 0:1994f17a630e (inactive) |
244 default 0:1994f17a630e (inactive) |
271 Stripping multiple branches in one go bypasses the fast-case code to |
271 Stripping multiple branches in one go bypasses the fast-case code to |
272 update the branch cache. |
272 update the branch cache. |
273 |
273 |
274 $ hg strip 2 |
274 $ hg strip 2 |
275 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
275 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
276 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-backup.hg (glob) |
276 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-11b7c407-backup.hg (glob) |
277 |
277 |
278 $ hg tglog |
278 $ hg tglog |
279 o 3: 'C' branch2 |
279 o 3: 'C' branch2 |
280 | |
280 | |
281 o 2: 'branch2' branch2 |
281 o 2: 'branch2' branch2 |
332 2: 'A' branch1 |
332 2: 'A' branch1 |
333 1: 'branch2' branch2 |
333 1: 'branch2' branch2 |
334 |
334 |
335 $ hg strip 2 |
335 $ hg strip 2 |
336 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
336 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
337 saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-backup.hg (glob) |
337 saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-a3b6984e-backup.hg (glob) |
338 |
338 |
339 $ hg theads |
339 $ hg theads |
340 1: 'branch2' branch2 |
340 1: 'branch2' branch2 |
341 0: 'branch1' branch1 |
341 0: 'branch1' branch1 |
342 |
342 |
377 o 0: 'A' |
377 o 0: 'A' |
378 |
378 |
379 |
379 |
380 $ hg strip 3 4 |
380 $ hg strip 3 4 |
381 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
381 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
382 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-backup.hg (glob) |
382 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-b9243789-backup.hg (glob) |
383 |
383 |
384 $ hg theads |
384 $ hg theads |
385 2: 'C' |
385 2: 'C' |
386 |
386 |
387 $ hg strip 2 1 |
387 $ hg strip 2 1 |
388 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
388 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
389 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-backup.hg (glob) |
389 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-a687065f-backup.hg (glob) |
390 |
390 |
391 $ hg theads |
391 $ hg theads |
392 0: 'A' |
392 0: 'A' |
393 |
393 |
394 Make sure rebase does not break for phase/filter related reason |
394 Make sure rebase does not break for phase/filter related reason |
483 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e |
483 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e |
484 rebasing 5:361a99976cc9 "F" |
484 rebasing 5:361a99976cc9 "F" |
485 HGEDITFORM=rebase.merge |
485 HGEDITFORM=rebase.merge |
486 rebasing 8:326cfedc031c "I" (tip) |
486 rebasing 8:326cfedc031c "I" (tip) |
487 HGEDITFORM=rebase.normal |
487 HGEDITFORM=rebase.normal |
488 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-backup.hg (glob) |
488 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-backup.hg (glob) |