##// END OF EJS Templates
tests: demonstrate broken copies.pathcopies()...
Martin von Zweigbergk -
r40486:f1c1b4d0 stable
parent child Browse files
Show More
@@ -1,57 +1,66
1
1
2 $ . "$TESTDIR/narrow-library.sh"
2 $ . "$TESTDIR/narrow-library.sh"
3
3
4 create full repo
4 create full repo
5
5
6 $ hg init master
6 $ hg init master
7 $ cd master
7 $ cd master
8
8
9 $ mkdir inside
9 $ mkdir inside
10 $ echo inside > inside/f1
10 $ echo inside > inside/f1
11 $ mkdir outside
11 $ mkdir outside
12 $ echo outside > outside/f2
12 $ echo outside > outside/f2
13 $ hg ci -Aqm 'initial'
13 $ hg ci -Aqm 'initial'
14
14
15 $ hg mv outside/f2 inside/f2
15 $ hg mv outside/f2 inside/f2
16 $ hg ci -qm 'move f2 from outside'
16 $ hg ci -qm 'move f2 from outside'
17
17
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
28 added 3 changesets with 3 changes to 2 files
30 added 3 changesets with 3 changes to 2 files
29 new changesets *:* (glob)
31 new changesets *:* (glob)
30 updating to branch default
32 updating to branch default
31 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
33 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
32 $ cd narrow
34 $ cd narrow
33
35
34 $ hg co 'desc("move f2")'
36 $ hg co 'desc("move f2")'
35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
36 $ hg status
38 $ hg status
37 $ hg diff
39 $ hg diff
38 $ hg diff --change . --git
40 $ hg diff --change . --git
39 diff --git a/inside/f2 b/inside/f2
41 diff --git a/inside/f2 b/inside/f2
40 new file mode 100644
42 new file mode 100644
41 --- /dev/null
43 --- /dev/null
42 +++ b/inside/f2
44 +++ b/inside/f2
43 @@ -0,0 +1,1 @@
45 @@ -0,0 +1,1 @@
44 +outside
46 +outside
45
47
46 $ hg log --follow inside/f2 -r tip
48 $ hg log --follow inside/f2 -r tip
47 changeset: 2:bcfb756e0ca9
49 changeset: 2:bcfb756e0ca9
48 tag: tip
50 tag: tip
49 user: test
51 user: test
50 date: Thu Jan 01 00:00:00 1970 +0000
52 date: Thu Jan 01 00:00:00 1970 +0000
51 summary: modify inside/f2
53 summary: modify inside/f2
52
54
53 changeset: 1:5a016133b2bb
55 changeset: 1:5a016133b2bb
54 user: test
56 user: test
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