Show More
@@ -18,10 +18,12 create full repo | |||||
18 | $ echo modified > inside/f2 |
|
18 | $ echo modified > inside/f2 | |
19 | $ hg ci -qm 'modify inside/f2' |
|
19 | $ hg ci -qm 'modify inside/f2' | |
20 |
|
20 | |||
|
21 | $ mkdir outside | |||
|
22 | $ echo new > outside/f3 | |||
|
23 | $ hg ci -Aqm 'add outside/f3' | |||
21 | $ cd .. |
|
24 | $ cd .. | |
22 |
|
25 | |||
23 | $ hg clone --narrow ssh://user@dummy/master narrow --include inside |
|
26 | $ hg clone --narrow ssh://user@dummy/master narrow --include inside -r 2 | |
24 | requesting all changes |
|
|||
25 | adding changesets |
|
27 | adding changesets | |
26 | adding manifests |
|
28 | adding manifests | |
27 | adding file changes |
|
29 | adding file changes | |
@@ -55,3 +57,10 create full repo | |||||
55 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
57 | date: Thu Jan 01 00:00:00 1970 +0000 | |
56 | summary: move f2 from outside |
|
58 | summary: move f2 from outside | |
57 |
|
59 | |||
|
60 | $ echo new > inside/f4 | |||
|
61 | $ hg ci -Aqm 'add inside/f4' | |||
|
62 | $ hg pull -q | |||
|
63 | $ hg --config extensions.rebase= rebase -d tip | |||
|
64 | rebasing 3:4f84b666728c "add inside/f4" | |||
|
65 | abort: data/outside/f3.i@54e53435331b: no match found! | |||
|
66 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now