##// END OF EJS Templates
tests: demonstrate broken copies._fullcopytracing()...
Martin von Zweigbergk -
r40488:d049ee8e stable
parent child Browse files
Show More
@@ -1,65 +1,75 b''
1 1
2 2 $ . "$TESTDIR/narrow-library.sh"
3 3
4 4 create full repo
5 5
6 6 $ hg init master
7 7 $ cd master
8 8
9 9 $ mkdir inside
10 10 $ echo inside > inside/f1
11 11 $ mkdir outside
12 12 $ echo outside > outside/f2
13 13 $ hg ci -Aqm 'initial'
14 14
15 15 $ hg mv outside/f2 inside/f2
16 16 $ hg ci -qm 'move f2 from outside'
17 17
18 18 $ echo modified > inside/f2
19 19 $ hg ci -qm 'modify inside/f2'
20 20
21 21 $ mkdir outside
22 22 $ echo new > outside/f3
23 23 $ hg ci -Aqm 'add outside/f3'
24 24 $ cd ..
25 25
26 26 $ hg clone --narrow ssh://user@dummy/master narrow --include inside -r 2
27 27 adding changesets
28 28 adding manifests
29 29 adding file changes
30 30 added 3 changesets with 3 changes to 2 files
31 31 new changesets *:* (glob)
32 32 updating to branch default
33 33 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
34 34 $ cd narrow
35 35
36 36 $ hg co 'desc("move f2")'
37 37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
38 38 $ hg status
39 39 $ hg diff
40 40 $ hg diff --change . --git
41 41 diff --git a/inside/f2 b/inside/f2
42 42 new file mode 100644
43 43 --- /dev/null
44 44 +++ b/inside/f2
45 45 @@ -0,0 +1,1 @@
46 46 +outside
47 47
48 48 $ hg log --follow inside/f2 -r tip
49 49 changeset: 2:bcfb756e0ca9
50 50 tag: tip
51 51 user: test
52 52 date: Thu Jan 01 00:00:00 1970 +0000
53 53 summary: modify inside/f2
54 54
55 55 changeset: 1:5a016133b2bb
56 56 user: test
57 57 date: Thu Jan 01 00:00:00 1970 +0000
58 58 summary: move f2 from outside
59 59
60 60 $ echo new > inside/f4
61 61 $ hg ci -Aqm 'add inside/f4'
62 62 $ hg pull -q
63 63 $ hg --config extensions.rebase= rebase -d tip
64 64 rebasing 3:4f84b666728c "add inside/f4"
65 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]
General Comments 0
You need to be logged in to leave comments. Login now