equal
deleted
inserted
replaced
61 $ hg ci -Aqm 'add inside/f4' |
61 $ hg ci -Aqm 'add inside/f4' |
62 $ hg pull -q |
62 $ hg pull -q |
63 $ hg --config extensions.rebase= rebase -d tip |
63 $ hg --config extensions.rebase= rebase -d tip |
64 rebasing 3:4f84b666728c "add inside/f4" |
64 rebasing 3:4f84b666728c "add inside/f4" |
65 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/4f84b666728c-4269b76e-rebase.hg |
65 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/4f84b666728c-4269b76e-rebase.hg |
|
66 |
|
67 $ hg co -q 0 |
|
68 $ echo modified > inside/f1 |
|
69 $ hg ci -qm 'modify inside/f1' |
|
70 $ echo new > inside/f5 |
|
71 $ hg ci -Aqm 'add inside/f5' |
|
72 $ hg --config extensions.rebase= rebase -d 'public()' -r . |
|
73 rebasing 6:610b60178c28 "add inside/f5" (tip) |
|
74 abort: data/outside/f3.i@54e53435331b: no match found! |
|
75 [255] |