|
1 $ echo "[extensions]" >> $HGRCPATH |
|
2 $ echo "mq=" >> $HGRCPATH |
|
3 |
|
4 $ tipparents() { |
|
5 > hg parents --template "{rev}:{node|short} {desc|firstline}\n" -r tip |
|
6 > } |
|
7 |
|
8 Test import and merge diffs |
|
9 |
|
10 $ hg init repo |
|
11 $ cd repo |
|
12 $ echo a > a |
|
13 $ hg ci -Am adda |
|
14 adding a |
|
15 $ echo a >> a |
|
16 $ hg ci -m changea |
|
17 $ echo c > c |
|
18 $ hg ci -Am addc |
|
19 adding c |
|
20 $ hg up 0 |
|
21 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
22 $ echo b > b |
|
23 $ hg ci -Am addb |
|
24 adding b |
|
25 created new head |
|
26 $ hg up 1 |
|
27 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
28 $ hg merge 3 |
|
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
30 (branch merge, don't forget to commit) |
|
31 $ hg ci -m merge |
|
32 $ hg export . > ../merge.diff |
|
33 $ cd .. |
|
34 $ hg clone -r2 repo repo2 |
|
35 adding changesets |
|
36 adding manifests |
|
37 adding file changes |
|
38 added 3 changesets with 3 changes to 2 files |
|
39 updating to branch default |
|
40 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
41 $ cd repo2 |
|
42 $ hg pull -r3 ../repo |
|
43 pulling from ../repo |
|
44 searching for changes |
|
45 adding changesets |
|
46 adding manifests |
|
47 adding file changes |
|
48 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
49 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
50 |
|
51 Test without --exact and diff.p1 == workingdir.p1 |
|
52 |
|
53 $ hg up 1 |
|
54 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
55 $ hg import ../merge.diff |
|
56 applying ../merge.diff |
|
57 $ tipparents |
|
58 1:540395c44225 changea |
|
59 3:102a90ea7b4a addb |
|
60 $ hg strip --no-backup tip |
|
61 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
62 |
|
63 Test without --exact and diff.p1 != workingdir.p1 |
|
64 |
|
65 $ hg up 2 |
|
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67 $ hg import ../merge.diff |
|
68 applying ../merge.diff |
|
69 $ tipparents |
|
70 2:890ecaa90481 addc |
|
71 $ hg strip --no-backup tip |
|
72 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
73 |
|
74 Test with --exact |
|
75 |
|
76 $ hg import --exact ../merge.diff |
|
77 applying ../merge.diff |
|
78 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
79 $ tipparents |
|
80 1:540395c44225 changea |
|
81 3:102a90ea7b4a addb |
|
82 $ hg strip --no-backup tip |
|
83 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
84 |
|
85 Test with --bypass and diff.p1 == workingdir.p1 |
|
86 |
|
87 $ hg up 1 |
|
88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
89 $ hg import --bypass ../merge.diff |
|
90 applying ../merge.diff |
|
91 $ tipparents |
|
92 1:540395c44225 changea |
|
93 3:102a90ea7b4a addb |
|
94 $ hg strip --no-backup tip |
|
95 |
|
96 Test with --bypass and diff.p1 != workingdir.p1 |
|
97 |
|
98 $ hg up 2 |
|
99 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
100 $ hg import --bypass ../merge.diff |
|
101 applying ../merge.diff |
|
102 $ tipparents |
|
103 2:890ecaa90481 addc |
|
104 $ hg strip --no-backup tip |
|
105 |
|
106 Test with --bypass and --exact |
|
107 |
|
108 $ hg import --bypass --exact ../merge.diff |
|
109 applying ../merge.diff |
|
110 $ tipparents |
|
111 1:540395c44225 changea |
|
112 3:102a90ea7b4a addb |
|
113 $ hg strip --no-backup tip |
|
114 |