Show More
@@ -1,782 +1,795 b'' | |||||
1 | Set up a base, local, and remote changeset, as well as the working copy state. |
|
1 | Set up a base, local, and remote changeset, as well as the working copy state. | |
2 | Files names are of the form base_remote_local_working-copy. For example, |
|
2 | Files names are of the form base_remote_local_working-copy. For example, | |
3 | content1_content2_content1_content2-untracked represents a |
|
3 | content1_content2_content1_content2-untracked represents a | |
4 | file that was modified in the remote changeset, left untouched in the |
|
4 | file that was modified in the remote changeset, left untouched in the | |
5 | local changeset, and then modified in the working copy to match the |
|
5 | local changeset, and then modified in the working copy to match the | |
6 | remote content, then finally forgotten. |
|
6 | remote content, then finally forgotten. | |
7 |
|
7 | |||
8 | $ hg init repo |
|
8 | $ hg init repo | |
9 | $ cd repo |
|
9 | $ cd repo | |
10 |
|
10 | |||
11 | Create base changeset |
|
11 | Create base changeset | |
12 |
|
12 | |||
13 | $ python $TESTDIR/generate-working-copy-states.py state 3 1 |
|
13 | $ python $TESTDIR/generate-working-copy-states.py state 3 1 | |
14 | $ hg addremove -q --similarity 0 |
|
14 | $ hg addremove -q --similarity 0 | |
15 | $ hg commit -qm 'base' |
|
15 | $ hg commit -qm 'base' | |
16 |
|
16 | |||
17 | Create remote changeset |
|
17 | Create remote changeset | |
18 |
|
18 | |||
19 | $ python $TESTDIR/generate-working-copy-states.py state 3 2 |
|
19 | $ python $TESTDIR/generate-working-copy-states.py state 3 2 | |
20 | $ hg addremove -q --similarity 0 |
|
20 | $ hg addremove -q --similarity 0 | |
21 | $ hg commit -qm 'remote' |
|
21 | $ hg commit -qm 'remote' | |
22 |
|
22 | |||
23 | Create local changeset |
|
23 | Create local changeset | |
24 |
|
24 | |||
25 | $ hg update -q 0 |
|
25 | $ hg update -q 0 | |
26 | $ python $TESTDIR/generate-working-copy-states.py state 3 3 |
|
26 | $ python $TESTDIR/generate-working-copy-states.py state 3 3 | |
27 | $ hg addremove -q --similarity 0 |
|
27 | $ hg addremove -q --similarity 0 | |
28 | $ hg commit -qm 'local' |
|
28 | $ hg commit -qm 'local' | |
29 |
|
29 | |||
30 | Set up working directory |
|
30 | Set up working directory | |
31 |
|
31 | |||
32 | $ python $TESTDIR/generate-working-copy-states.py state 3 wc |
|
32 | $ python $TESTDIR/generate-working-copy-states.py state 3 wc | |
33 | $ hg addremove -q --similarity 0 |
|
33 | $ hg addremove -q --similarity 0 | |
34 | $ hg forget *_*_*_*-untracked |
|
34 | $ hg forget *_*_*_*-untracked | |
35 | $ rm *_*_*_missing-* |
|
35 | $ rm *_*_*_missing-* | |
36 |
|
36 | |||
37 | $ hg status -A |
|
37 | $ hg status -A | |
38 | M content1_content1_content1_content4-tracked |
|
38 | M content1_content1_content1_content4-tracked | |
39 | M content1_content1_content3_content1-tracked |
|
39 | M content1_content1_content3_content1-tracked | |
40 | M content1_content1_content3_content4-tracked |
|
40 | M content1_content1_content3_content4-tracked | |
41 | M content1_content2_content1_content2-tracked |
|
41 | M content1_content2_content1_content2-tracked | |
42 | M content1_content2_content1_content4-tracked |
|
42 | M content1_content2_content1_content4-tracked | |
43 | M content1_content2_content2_content1-tracked |
|
43 | M content1_content2_content2_content1-tracked | |
44 | M content1_content2_content2_content4-tracked |
|
44 | M content1_content2_content2_content4-tracked | |
45 | M content1_content2_content3_content1-tracked |
|
45 | M content1_content2_content3_content1-tracked | |
46 | M content1_content2_content3_content2-tracked |
|
46 | M content1_content2_content3_content2-tracked | |
47 | M content1_content2_content3_content4-tracked |
|
47 | M content1_content2_content3_content4-tracked | |
48 | M content1_missing_content1_content4-tracked |
|
48 | M content1_missing_content1_content4-tracked | |
49 | M content1_missing_content3_content1-tracked |
|
49 | M content1_missing_content3_content1-tracked | |
50 | M content1_missing_content3_content4-tracked |
|
50 | M content1_missing_content3_content4-tracked | |
51 | M missing_content2_content2_content4-tracked |
|
51 | M missing_content2_content2_content4-tracked | |
52 | M missing_content2_content3_content2-tracked |
|
52 | M missing_content2_content3_content2-tracked | |
53 | M missing_content2_content3_content4-tracked |
|
53 | M missing_content2_content3_content4-tracked | |
54 | M missing_missing_content3_content4-tracked |
|
54 | M missing_missing_content3_content4-tracked | |
55 | A content1_content1_missing_content1-tracked |
|
55 | A content1_content1_missing_content1-tracked | |
56 | A content1_content1_missing_content4-tracked |
|
56 | A content1_content1_missing_content4-tracked | |
57 | A content1_content2_missing_content1-tracked |
|
57 | A content1_content2_missing_content1-tracked | |
58 | A content1_content2_missing_content2-tracked |
|
58 | A content1_content2_missing_content2-tracked | |
59 | A content1_content2_missing_content4-tracked |
|
59 | A content1_content2_missing_content4-tracked | |
60 | A content1_missing_missing_content1-tracked |
|
60 | A content1_missing_missing_content1-tracked | |
61 | A content1_missing_missing_content4-tracked |
|
61 | A content1_missing_missing_content4-tracked | |
62 | A missing_content2_missing_content2-tracked |
|
62 | A missing_content2_missing_content2-tracked | |
63 | A missing_content2_missing_content4-tracked |
|
63 | A missing_content2_missing_content4-tracked | |
64 | A missing_missing_missing_content4-tracked |
|
64 | A missing_missing_missing_content4-tracked | |
65 | R content1_content1_content1_content1-untracked |
|
65 | R content1_content1_content1_content1-untracked | |
66 | R content1_content1_content1_content4-untracked |
|
66 | R content1_content1_content1_content4-untracked | |
67 | R content1_content1_content1_missing-untracked |
|
67 | R content1_content1_content1_missing-untracked | |
68 | R content1_content1_content3_content1-untracked |
|
68 | R content1_content1_content3_content1-untracked | |
69 | R content1_content1_content3_content3-untracked |
|
69 | R content1_content1_content3_content3-untracked | |
70 | R content1_content1_content3_content4-untracked |
|
70 | R content1_content1_content3_content4-untracked | |
71 | R content1_content1_content3_missing-untracked |
|
71 | R content1_content1_content3_missing-untracked | |
72 | R content1_content2_content1_content1-untracked |
|
72 | R content1_content2_content1_content1-untracked | |
73 | R content1_content2_content1_content2-untracked |
|
73 | R content1_content2_content1_content2-untracked | |
74 | R content1_content2_content1_content4-untracked |
|
74 | R content1_content2_content1_content4-untracked | |
75 | R content1_content2_content1_missing-untracked |
|
75 | R content1_content2_content1_missing-untracked | |
76 | R content1_content2_content2_content1-untracked |
|
76 | R content1_content2_content2_content1-untracked | |
77 | R content1_content2_content2_content2-untracked |
|
77 | R content1_content2_content2_content2-untracked | |
78 | R content1_content2_content2_content4-untracked |
|
78 | R content1_content2_content2_content4-untracked | |
79 | R content1_content2_content2_missing-untracked |
|
79 | R content1_content2_content2_missing-untracked | |
80 | R content1_content2_content3_content1-untracked |
|
80 | R content1_content2_content3_content1-untracked | |
81 | R content1_content2_content3_content2-untracked |
|
81 | R content1_content2_content3_content2-untracked | |
82 | R content1_content2_content3_content3-untracked |
|
82 | R content1_content2_content3_content3-untracked | |
83 | R content1_content2_content3_content4-untracked |
|
83 | R content1_content2_content3_content4-untracked | |
84 | R content1_content2_content3_missing-untracked |
|
84 | R content1_content2_content3_missing-untracked | |
85 | R content1_missing_content1_content1-untracked |
|
85 | R content1_missing_content1_content1-untracked | |
86 | R content1_missing_content1_content4-untracked |
|
86 | R content1_missing_content1_content4-untracked | |
87 | R content1_missing_content1_missing-untracked |
|
87 | R content1_missing_content1_missing-untracked | |
88 | R content1_missing_content3_content1-untracked |
|
88 | R content1_missing_content3_content1-untracked | |
89 | R content1_missing_content3_content3-untracked |
|
89 | R content1_missing_content3_content3-untracked | |
90 | R content1_missing_content3_content4-untracked |
|
90 | R content1_missing_content3_content4-untracked | |
91 | R content1_missing_content3_missing-untracked |
|
91 | R content1_missing_content3_missing-untracked | |
92 | R missing_content2_content2_content2-untracked |
|
92 | R missing_content2_content2_content2-untracked | |
93 | R missing_content2_content2_content4-untracked |
|
93 | R missing_content2_content2_content4-untracked | |
94 | R missing_content2_content2_missing-untracked |
|
94 | R missing_content2_content2_missing-untracked | |
95 | R missing_content2_content3_content2-untracked |
|
95 | R missing_content2_content3_content2-untracked | |
96 | R missing_content2_content3_content3-untracked |
|
96 | R missing_content2_content3_content3-untracked | |
97 | R missing_content2_content3_content4-untracked |
|
97 | R missing_content2_content3_content4-untracked | |
98 | R missing_content2_content3_missing-untracked |
|
98 | R missing_content2_content3_missing-untracked | |
99 | R missing_missing_content3_content3-untracked |
|
99 | R missing_missing_content3_content3-untracked | |
100 | R missing_missing_content3_content4-untracked |
|
100 | R missing_missing_content3_content4-untracked | |
101 | R missing_missing_content3_missing-untracked |
|
101 | R missing_missing_content3_missing-untracked | |
102 | ! content1_content1_content1_missing-tracked |
|
102 | ! content1_content1_content1_missing-tracked | |
103 | ! content1_content1_content3_missing-tracked |
|
103 | ! content1_content1_content3_missing-tracked | |
104 | ! content1_content1_missing_missing-tracked |
|
104 | ! content1_content1_missing_missing-tracked | |
105 | ! content1_content2_content1_missing-tracked |
|
105 | ! content1_content2_content1_missing-tracked | |
106 | ! content1_content2_content2_missing-tracked |
|
106 | ! content1_content2_content2_missing-tracked | |
107 | ! content1_content2_content3_missing-tracked |
|
107 | ! content1_content2_content3_missing-tracked | |
108 | ! content1_content2_missing_missing-tracked |
|
108 | ! content1_content2_missing_missing-tracked | |
109 | ! content1_missing_content1_missing-tracked |
|
109 | ! content1_missing_content1_missing-tracked | |
110 | ! content1_missing_content3_missing-tracked |
|
110 | ! content1_missing_content3_missing-tracked | |
111 | ! content1_missing_missing_missing-tracked |
|
111 | ! content1_missing_missing_missing-tracked | |
112 | ! missing_content2_content2_missing-tracked |
|
112 | ! missing_content2_content2_missing-tracked | |
113 | ! missing_content2_content3_missing-tracked |
|
113 | ! missing_content2_content3_missing-tracked | |
114 | ! missing_content2_missing_missing-tracked |
|
114 | ! missing_content2_missing_missing-tracked | |
115 | ! missing_missing_content3_missing-tracked |
|
115 | ! missing_missing_content3_missing-tracked | |
116 | ! missing_missing_missing_missing-tracked |
|
116 | ! missing_missing_missing_missing-tracked | |
117 | ? content1_content1_missing_content1-untracked |
|
117 | ? content1_content1_missing_content1-untracked | |
118 | ? content1_content1_missing_content4-untracked |
|
118 | ? content1_content1_missing_content4-untracked | |
119 | ? content1_content2_missing_content1-untracked |
|
119 | ? content1_content2_missing_content1-untracked | |
120 | ? content1_content2_missing_content2-untracked |
|
120 | ? content1_content2_missing_content2-untracked | |
121 | ? content1_content2_missing_content4-untracked |
|
121 | ? content1_content2_missing_content4-untracked | |
122 | ? content1_missing_missing_content1-untracked |
|
122 | ? content1_missing_missing_content1-untracked | |
123 | ? content1_missing_missing_content4-untracked |
|
123 | ? content1_missing_missing_content4-untracked | |
124 | ? missing_content2_missing_content2-untracked |
|
124 | ? missing_content2_missing_content2-untracked | |
125 | ? missing_content2_missing_content4-untracked |
|
125 | ? missing_content2_missing_content4-untracked | |
126 | ? missing_missing_missing_content4-untracked |
|
126 | ? missing_missing_missing_content4-untracked | |
127 | C content1_content1_content1_content1-tracked |
|
127 | C content1_content1_content1_content1-tracked | |
128 | C content1_content1_content3_content3-tracked |
|
128 | C content1_content1_content3_content3-tracked | |
129 | C content1_content2_content1_content1-tracked |
|
129 | C content1_content2_content1_content1-tracked | |
130 | C content1_content2_content2_content2-tracked |
|
130 | C content1_content2_content2_content2-tracked | |
131 | C content1_content2_content3_content3-tracked |
|
131 | C content1_content2_content3_content3-tracked | |
132 | C content1_missing_content1_content1-tracked |
|
132 | C content1_missing_content1_content1-tracked | |
133 | C content1_missing_content3_content3-tracked |
|
133 | C content1_missing_content3_content3-tracked | |
134 | C missing_content2_content2_content2-tracked |
|
134 | C missing_content2_content2_content2-tracked | |
135 | C missing_content2_content3_content3-tracked |
|
135 | C missing_content2_content3_content3-tracked | |
136 | C missing_missing_content3_content3-tracked |
|
136 | C missing_missing_content3_content3-tracked | |
137 |
|
137 | |||
138 | Merge with remote |
|
138 | Merge with remote | |
139 |
|
139 | |||
140 | # Notes: |
|
140 | # Notes: | |
141 | # - local and remote changed content1_content2_*_content2-untracked |
|
141 | # - local and remote changed content1_content2_*_content2-untracked | |
142 | # in the same way, so it could potentially be left alone |
|
142 | # in the same way, so it could potentially be left alone | |
143 |
|
143 | |||
144 | $ hg merge -f --tool internal:merge3 'desc("remote")' |
|
144 | $ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1 | |
145 | local changed content1_missing_content1_content4-tracked which remote deleted |
|
145 | local changed content1_missing_content1_content4-tracked which remote deleted | |
146 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
146 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
147 | local changed content1_missing_content3_content3-tracked which remote deleted |
|
147 | local changed content1_missing_content3_content3-tracked which remote deleted | |
148 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
148 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
149 | local changed content1_missing_content3_content4-tracked which remote deleted |
|
149 | local changed content1_missing_content3_content4-tracked which remote deleted | |
150 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
150 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
151 | local changed content1_missing_missing_content4-tracked which remote deleted |
|
151 | local changed content1_missing_missing_content4-tracked which remote deleted | |
152 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
152 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
153 | remote changed content1_content2_content1_content1-untracked which local deleted |
|
153 | remote changed content1_content2_content1_content1-untracked which local deleted | |
154 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
154 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
155 | remote changed content1_content2_content1_content2-untracked which local deleted |
|
155 | remote changed content1_content2_content1_content2-untracked which local deleted | |
156 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
156 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
157 | remote changed content1_content2_content1_content4-untracked which local deleted |
|
157 | remote changed content1_content2_content1_content4-untracked which local deleted | |
158 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
158 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
159 | remote changed content1_content2_content1_missing-tracked which local deleted |
|
159 | remote changed content1_content2_content1_missing-tracked which local deleted | |
160 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
160 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
161 | remote changed content1_content2_content1_missing-untracked which local deleted |
|
161 | remote changed content1_content2_content1_missing-untracked which local deleted | |
162 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
162 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
163 | remote changed content1_content2_content2_content1-untracked which local deleted |
|
163 | remote changed content1_content2_content2_content1-untracked which local deleted | |
164 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
164 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
165 | remote changed content1_content2_content2_content2-untracked which local deleted |
|
165 | remote changed content1_content2_content2_content2-untracked which local deleted | |
166 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
166 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
167 | remote changed content1_content2_content2_content4-untracked which local deleted |
|
167 | remote changed content1_content2_content2_content4-untracked which local deleted | |
168 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
168 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
169 | remote changed content1_content2_content2_missing-tracked which local deleted |
|
169 | remote changed content1_content2_content2_missing-tracked which local deleted | |
170 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
170 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
171 | remote changed content1_content2_content2_missing-untracked which local deleted |
|
171 | remote changed content1_content2_content2_missing-untracked which local deleted | |
172 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
172 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
173 | remote changed content1_content2_content3_content1-untracked which local deleted |
|
173 | remote changed content1_content2_content3_content1-untracked which local deleted | |
174 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
174 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
175 | remote changed content1_content2_content3_content2-untracked which local deleted |
|
175 | remote changed content1_content2_content3_content2-untracked which local deleted | |
176 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
176 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
177 | remote changed content1_content2_content3_content3-untracked which local deleted |
|
177 | remote changed content1_content2_content3_content3-untracked which local deleted | |
178 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
178 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
179 | remote changed content1_content2_content3_content4-untracked which local deleted |
|
179 | remote changed content1_content2_content3_content4-untracked which local deleted | |
180 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
180 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
181 | remote changed content1_content2_content3_missing-tracked which local deleted |
|
181 | remote changed content1_content2_content3_missing-tracked which local deleted | |
182 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
182 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
183 | remote changed content1_content2_content3_missing-untracked which local deleted |
|
183 | remote changed content1_content2_content3_missing-untracked which local deleted | |
184 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
184 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
185 | remote changed content1_content2_missing_content1-untracked which local deleted |
|
185 | remote changed content1_content2_missing_content1-untracked which local deleted | |
186 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
186 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
187 | remote changed content1_content2_missing_content2-untracked which local deleted |
|
187 | remote changed content1_content2_missing_content2-untracked which local deleted | |
188 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
188 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
189 | remote changed content1_content2_missing_content4-untracked which local deleted |
|
189 | remote changed content1_content2_missing_content4-untracked which local deleted | |
190 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
190 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
191 | remote changed content1_content2_missing_missing-tracked which local deleted |
|
191 | remote changed content1_content2_missing_missing-tracked which local deleted | |
192 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
192 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
193 | remote changed content1_content2_missing_missing-untracked which local deleted |
|
193 | remote changed content1_content2_missing_missing-untracked which local deleted | |
194 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
194 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
195 | merging content1_content2_content1_content4-tracked |
|
195 | merging content1_content2_content1_content4-tracked | |
196 | merging content1_content2_content2_content1-tracked |
|
196 | merging content1_content2_content2_content1-tracked | |
197 | merging content1_content2_content2_content4-tracked |
|
197 | merging content1_content2_content2_content4-tracked | |
198 | merging content1_content2_content3_content1-tracked |
|
198 | merging content1_content2_content3_content1-tracked | |
199 | merging content1_content2_content3_content3-tracked |
|
199 | merging content1_content2_content3_content3-tracked | |
200 | merging content1_content2_content3_content4-tracked |
|
200 | merging content1_content2_content3_content4-tracked | |
201 | merging content1_content2_missing_content1-tracked |
|
201 | merging content1_content2_missing_content1-tracked | |
202 | merging content1_content2_missing_content4-tracked |
|
202 | merging content1_content2_missing_content4-tracked | |
203 | merging missing_content2_content2_content4-tracked |
|
203 | merging missing_content2_content2_content4-tracked | |
204 | merging missing_content2_content3_content3-tracked |
|
204 | merging missing_content2_content3_content3-tracked | |
205 | merging missing_content2_content3_content4-tracked |
|
205 | merging missing_content2_content3_content4-tracked | |
206 | merging missing_content2_missing_content4-tracked |
|
206 | merging missing_content2_missing_content4-tracked | |
207 | merging missing_content2_missing_content4-untracked |
|
207 | merging missing_content2_missing_content4-untracked | |
208 | warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark') |
|
208 | warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark') | |
209 | warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
|
209 | warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') | |
210 | warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
|
210 | warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') | |
211 | warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
|
211 | warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') | |
212 | warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
|
212 | warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') | |
213 | warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
|
213 | warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') | |
214 | warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
|
214 | warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') | |
215 | warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
|
215 | warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') | |
216 | warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
|
216 | warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') | |
217 | warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') |
|
217 | warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') | |
218 | 18 files updated, 3 files merged, 8 files removed, 35 files unresolved |
|
218 | 18 files updated, 3 files merged, 8 files removed, 35 files unresolved | |
219 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
219 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
220 | [1] |
|
|||
221 |
|
220 | |||
222 | Check which files need to be resolved (should correspond to the output above). |
|
221 | Check which files need to be resolved (should correspond to the output above). | |
223 | This should be the files for which the base (1st filename segment), the remote |
|
222 | This should be the files for which the base (1st filename segment), the remote | |
224 | (2nd segment) and the working copy (4th segment) are all different. |
|
223 | (2nd segment) and the working copy (4th segment) are all different. | |
225 |
|
224 | |||
226 | Interestingly, one untracked file got merged and added, which corresponds to the |
|
225 | Interestingly, one untracked file got merged and added, which corresponds to the | |
227 | odd 'if force and branchmerge and different' case in manifestmerge(). |
|
226 | odd 'if force and branchmerge and different' case in manifestmerge(). | |
228 |
|
227 | |||
229 | $ hg resolve -l |
|
228 | $ hg resolve -l | |
230 | U content1_content2_content1_content1-untracked |
|
229 | U content1_content2_content1_content1-untracked | |
231 | U content1_content2_content1_content2-untracked |
|
230 | U content1_content2_content1_content2-untracked | |
232 | U content1_content2_content1_content4-tracked |
|
231 | U content1_content2_content1_content4-tracked | |
233 | U content1_content2_content1_content4-untracked |
|
232 | U content1_content2_content1_content4-untracked | |
234 | U content1_content2_content1_missing-tracked |
|
233 | U content1_content2_content1_missing-tracked | |
235 | U content1_content2_content1_missing-untracked |
|
234 | U content1_content2_content1_missing-untracked | |
236 | R content1_content2_content2_content1-tracked |
|
235 | R content1_content2_content2_content1-tracked | |
237 | U content1_content2_content2_content1-untracked |
|
236 | U content1_content2_content2_content1-untracked | |
238 | U content1_content2_content2_content2-untracked |
|
237 | U content1_content2_content2_content2-untracked | |
239 | U content1_content2_content2_content4-tracked |
|
238 | U content1_content2_content2_content4-tracked | |
240 | U content1_content2_content2_content4-untracked |
|
239 | U content1_content2_content2_content4-untracked | |
241 | U content1_content2_content2_missing-tracked |
|
240 | U content1_content2_content2_missing-tracked | |
242 | U content1_content2_content2_missing-untracked |
|
241 | U content1_content2_content2_missing-untracked | |
243 | R content1_content2_content3_content1-tracked |
|
242 | R content1_content2_content3_content1-tracked | |
244 | U content1_content2_content3_content1-untracked |
|
243 | U content1_content2_content3_content1-untracked | |
245 | U content1_content2_content3_content2-untracked |
|
244 | U content1_content2_content3_content2-untracked | |
246 | U content1_content2_content3_content3-tracked |
|
245 | U content1_content2_content3_content3-tracked | |
247 | U content1_content2_content3_content3-untracked |
|
246 | U content1_content2_content3_content3-untracked | |
248 | U content1_content2_content3_content4-tracked |
|
247 | U content1_content2_content3_content4-tracked | |
249 | U content1_content2_content3_content4-untracked |
|
248 | U content1_content2_content3_content4-untracked | |
250 | U content1_content2_content3_missing-tracked |
|
249 | U content1_content2_content3_missing-tracked | |
251 | U content1_content2_content3_missing-untracked |
|
250 | U content1_content2_content3_missing-untracked | |
252 | R content1_content2_missing_content1-tracked |
|
251 | R content1_content2_missing_content1-tracked | |
253 | U content1_content2_missing_content1-untracked |
|
252 | U content1_content2_missing_content1-untracked | |
254 | U content1_content2_missing_content2-untracked |
|
253 | U content1_content2_missing_content2-untracked | |
255 | U content1_content2_missing_content4-tracked |
|
254 | U content1_content2_missing_content4-tracked | |
256 | U content1_content2_missing_content4-untracked |
|
255 | U content1_content2_missing_content4-untracked | |
257 | U content1_content2_missing_missing-tracked |
|
256 | U content1_content2_missing_missing-tracked | |
258 | U content1_content2_missing_missing-untracked |
|
257 | U content1_content2_missing_missing-untracked | |
259 | U content1_missing_content1_content4-tracked |
|
258 | U content1_missing_content1_content4-tracked | |
260 | U content1_missing_content3_content3-tracked |
|
259 | U content1_missing_content3_content3-tracked | |
261 | U content1_missing_content3_content4-tracked |
|
260 | U content1_missing_content3_content4-tracked | |
262 | U content1_missing_missing_content4-tracked |
|
261 | U content1_missing_missing_content4-tracked | |
263 | U missing_content2_content2_content4-tracked |
|
262 | U missing_content2_content2_content4-tracked | |
264 | U missing_content2_content3_content3-tracked |
|
263 | U missing_content2_content3_content3-tracked | |
265 | U missing_content2_content3_content4-tracked |
|
264 | U missing_content2_content3_content4-tracked | |
266 | U missing_content2_missing_content4-tracked |
|
265 | U missing_content2_missing_content4-tracked | |
267 | U missing_content2_missing_content4-untracked |
|
266 | U missing_content2_missing_content4-untracked | |
268 |
|
267 | |||
269 | Check status and file content |
|
268 | Check status and file content | |
270 |
|
269 | |||
271 | Some files get added (e.g. content1_content2_content1_content1-untracked) |
|
270 | Some files get added (e.g. content1_content2_content1_content1-untracked) | |
272 |
|
271 | |||
273 | It is not intuitive that content1_content2_content1_content4-tracked gets |
|
272 | It is not intuitive that content1_content2_content1_content4-tracked gets | |
274 | merged while content1_content2_content1_content4-untracked gets overwritten. |
|
273 | merged while content1_content2_content1_content4-untracked gets overwritten. | |
275 | Any *_content2_*-untracked triggers the modified/deleted prompt and then gets |
|
274 | Any *_content2_*-untracked triggers the modified/deleted prompt and then gets | |
276 | overwritten. |
|
275 | overwritten. | |
277 |
|
276 | |||
278 | A lot of untracked files become tracked, for example |
|
277 | A lot of untracked files become tracked, for example | |
279 | content1_content2_content2_content2-untracked. |
|
278 | content1_content2_content2_content2-untracked. | |
280 |
|
279 | |||
281 | *_missing_missing_missing-tracked is reported as removed ('R'), which |
|
280 | *_missing_missing_missing-tracked is reported as removed ('R'), which | |
282 | doesn't make sense since the file did not exist in the parent, but on the |
|
281 | doesn't make sense since the file did not exist in the parent, but on the | |
283 | other hand, merged-in additions are reported as modifications, which is |
|
282 | other hand, merged-in additions are reported as modifications, which is | |
284 | almost as strange. |
|
283 | almost as strange. | |
285 |
|
284 | |||
286 | missing_missing_content3_missing-tracked becomes removed ('R'), even though |
|
285 | missing_missing_content3_missing-tracked becomes removed ('R'), even though | |
287 | the remote side did not touch the file |
|
286 | the remote side did not touch the file | |
288 |
|
287 | |||
289 | $ checkstatus() { |
|
288 | $ checkstatus() { | |
290 | > for f in `python $TESTDIR/generate-working-copy-states.py filelist 3` |
|
289 | > for f in `python $TESTDIR/generate-working-copy-states.py filelist 3` | |
291 | > do |
|
290 | > do | |
292 | > echo |
|
291 | > echo | |
293 | > hg status -A $f |
|
292 | > hg status -A $f | |
294 | > if test -f $f |
|
293 | > if test -f $f | |
295 | > then |
|
294 | > then | |
296 | > cat $f |
|
295 | > cat $f | |
297 | > else |
|
296 | > else | |
298 | > echo '<missing>' |
|
297 | > echo '<missing>' | |
299 | > fi |
|
298 | > fi | |
300 | > done |
|
299 | > done | |
301 | > } |
|
300 | > } | |
302 | $ checkstatus 2>&1 | tee $TESTTMP/status1 |
|
301 | $ checkstatus 2>&1 | tee $TESTTMP/status1 | |
303 |
|
302 | |||
304 | C content1_content1_content1_content1-tracked |
|
303 | C content1_content1_content1_content1-tracked | |
305 | content1 |
|
304 | content1 | |
306 |
|
305 | |||
307 | R content1_content1_content1_content1-untracked |
|
306 | R content1_content1_content1_content1-untracked | |
308 | content1 |
|
307 | content1 | |
309 |
|
308 | |||
310 | M content1_content1_content1_content4-tracked |
|
309 | M content1_content1_content1_content4-tracked | |
311 | content4 |
|
310 | content4 | |
312 |
|
311 | |||
313 | R content1_content1_content1_content4-untracked |
|
312 | R content1_content1_content1_content4-untracked | |
314 | content4 |
|
313 | content4 | |
315 |
|
314 | |||
316 | ! content1_content1_content1_missing-tracked |
|
315 | ! content1_content1_content1_missing-tracked | |
317 | <missing> |
|
316 | <missing> | |
318 |
|
317 | |||
319 | R content1_content1_content1_missing-untracked |
|
318 | R content1_content1_content1_missing-untracked | |
320 | <missing> |
|
319 | <missing> | |
321 |
|
320 | |||
322 | M content1_content1_content3_content1-tracked |
|
321 | M content1_content1_content3_content1-tracked | |
323 | content1 |
|
322 | content1 | |
324 |
|
323 | |||
325 | R content1_content1_content3_content1-untracked |
|
324 | R content1_content1_content3_content1-untracked | |
326 | content1 |
|
325 | content1 | |
327 |
|
326 | |||
328 | C content1_content1_content3_content3-tracked |
|
327 | C content1_content1_content3_content3-tracked | |
329 | content3 |
|
328 | content3 | |
330 |
|
329 | |||
331 | R content1_content1_content3_content3-untracked |
|
330 | R content1_content1_content3_content3-untracked | |
332 | content3 |
|
331 | content3 | |
333 |
|
332 | |||
334 | M content1_content1_content3_content4-tracked |
|
333 | M content1_content1_content3_content4-tracked | |
335 | content4 |
|
334 | content4 | |
336 |
|
335 | |||
337 | R content1_content1_content3_content4-untracked |
|
336 | R content1_content1_content3_content4-untracked | |
338 | content4 |
|
337 | content4 | |
339 |
|
338 | |||
340 | ! content1_content1_content3_missing-tracked |
|
339 | ! content1_content1_content3_missing-tracked | |
341 | <missing> |
|
340 | <missing> | |
342 |
|
341 | |||
343 | R content1_content1_content3_missing-untracked |
|
342 | R content1_content1_content3_missing-untracked | |
344 | <missing> |
|
343 | <missing> | |
345 |
|
344 | |||
346 | A content1_content1_missing_content1-tracked |
|
345 | A content1_content1_missing_content1-tracked | |
347 | content1 |
|
346 | content1 | |
348 |
|
347 | |||
349 | ? content1_content1_missing_content1-untracked |
|
348 | ? content1_content1_missing_content1-untracked | |
350 | content1 |
|
349 | content1 | |
351 |
|
350 | |||
352 | A content1_content1_missing_content4-tracked |
|
351 | A content1_content1_missing_content4-tracked | |
353 | content4 |
|
352 | content4 | |
354 |
|
353 | |||
355 | ? content1_content1_missing_content4-untracked |
|
354 | ? content1_content1_missing_content4-untracked | |
356 | content4 |
|
355 | content4 | |
357 |
|
356 | |||
358 | ! content1_content1_missing_missing-tracked |
|
357 | ! content1_content1_missing_missing-tracked | |
359 | <missing> |
|
358 | <missing> | |
360 |
|
359 | |||
361 | content1_content1_missing_missing-untracked: * (glob) |
|
360 | content1_content1_missing_missing-untracked: * (glob) | |
362 | <missing> |
|
361 | <missing> | |
363 |
|
362 | |||
364 | M content1_content2_content1_content1-tracked |
|
363 | M content1_content2_content1_content1-tracked | |
365 | content2 |
|
364 | content2 | |
366 |
|
365 | |||
367 | M content1_content2_content1_content1-untracked |
|
366 | M content1_content2_content1_content1-untracked | |
368 | content2 |
|
367 | content2 | |
369 |
|
368 | |||
370 | M content1_content2_content1_content2-tracked |
|
369 | M content1_content2_content1_content2-tracked | |
371 | content2 |
|
370 | content2 | |
372 |
|
371 | |||
373 | M content1_content2_content1_content2-untracked |
|
372 | M content1_content2_content1_content2-untracked | |
374 | content2 |
|
373 | content2 | |
375 |
|
374 | |||
376 | M content1_content2_content1_content4-tracked |
|
375 | M content1_content2_content1_content4-tracked | |
377 | <<<<<<< local: 0447570f1af6 - test: local |
|
376 | <<<<<<< local: 0447570f1af6 - test: local | |
378 | content4 |
|
377 | content4 | |
379 | ||||||| base |
|
378 | ||||||| base | |
380 | content1 |
|
379 | content1 | |
381 | ======= |
|
380 | ======= | |
382 | content2 |
|
381 | content2 | |
383 | >>>>>>> other: 85100b8c675b - test: remote |
|
382 | >>>>>>> other: 85100b8c675b - test: remote | |
384 |
|
383 | |||
385 | M content1_content2_content1_content4-untracked |
|
384 | M content1_content2_content1_content4-untracked | |
386 | content2 |
|
385 | content2 | |
387 |
|
386 | |||
388 | M content1_content2_content1_missing-tracked |
|
387 | M content1_content2_content1_missing-tracked | |
389 | content2 |
|
388 | content2 | |
390 |
|
389 | |||
391 | M content1_content2_content1_missing-untracked |
|
390 | M content1_content2_content1_missing-untracked | |
392 | content2 |
|
391 | content2 | |
393 |
|
392 | |||
394 | M content1_content2_content2_content1-tracked |
|
393 | M content1_content2_content2_content1-tracked | |
395 | content2 |
|
394 | content2 | |
396 |
|
395 | |||
397 | M content1_content2_content2_content1-untracked |
|
396 | M content1_content2_content2_content1-untracked | |
398 | content2 |
|
397 | content2 | |
399 |
|
398 | |||
400 | C content1_content2_content2_content2-tracked |
|
399 | C content1_content2_content2_content2-tracked | |
401 | content2 |
|
400 | content2 | |
402 |
|
401 | |||
403 | M content1_content2_content2_content2-untracked |
|
402 | M content1_content2_content2_content2-untracked | |
404 | content2 |
|
403 | content2 | |
405 |
|
404 | |||
406 | M content1_content2_content2_content4-tracked |
|
405 | M content1_content2_content2_content4-tracked | |
407 | <<<<<<< local: 0447570f1af6 - test: local |
|
406 | <<<<<<< local: 0447570f1af6 - test: local | |
408 | content4 |
|
407 | content4 | |
409 | ||||||| base |
|
408 | ||||||| base | |
410 | content1 |
|
409 | content1 | |
411 | ======= |
|
410 | ======= | |
412 | content2 |
|
411 | content2 | |
413 | >>>>>>> other: 85100b8c675b - test: remote |
|
412 | >>>>>>> other: 85100b8c675b - test: remote | |
414 |
|
413 | |||
415 | M content1_content2_content2_content4-untracked |
|
414 | M content1_content2_content2_content4-untracked | |
416 | content2 |
|
415 | content2 | |
417 |
|
416 | |||
418 | M content1_content2_content2_missing-tracked |
|
417 | M content1_content2_content2_missing-tracked | |
419 | content2 |
|
418 | content2 | |
420 |
|
419 | |||
421 | M content1_content2_content2_missing-untracked |
|
420 | M content1_content2_content2_missing-untracked | |
422 | content2 |
|
421 | content2 | |
423 |
|
422 | |||
424 | M content1_content2_content3_content1-tracked |
|
423 | M content1_content2_content3_content1-tracked | |
425 | content2 |
|
424 | content2 | |
426 |
|
425 | |||
427 | M content1_content2_content3_content1-untracked |
|
426 | M content1_content2_content3_content1-untracked | |
428 | content2 |
|
427 | content2 | |
429 |
|
428 | |||
430 | M content1_content2_content3_content2-tracked |
|
429 | M content1_content2_content3_content2-tracked | |
431 | content2 |
|
430 | content2 | |
432 |
|
431 | |||
433 | M content1_content2_content3_content2-untracked |
|
432 | M content1_content2_content3_content2-untracked | |
434 | content2 |
|
433 | content2 | |
435 |
|
434 | |||
436 | M content1_content2_content3_content3-tracked |
|
435 | M content1_content2_content3_content3-tracked | |
437 | <<<<<<< local: 0447570f1af6 - test: local |
|
436 | <<<<<<< local: 0447570f1af6 - test: local | |
438 | content3 |
|
437 | content3 | |
439 | ||||||| base |
|
438 | ||||||| base | |
440 | content1 |
|
439 | content1 | |
441 | ======= |
|
440 | ======= | |
442 | content2 |
|
441 | content2 | |
443 | >>>>>>> other: 85100b8c675b - test: remote |
|
442 | >>>>>>> other: 85100b8c675b - test: remote | |
444 |
|
443 | |||
445 | M content1_content2_content3_content3-untracked |
|
444 | M content1_content2_content3_content3-untracked | |
446 | content2 |
|
445 | content2 | |
447 |
|
446 | |||
448 | M content1_content2_content3_content4-tracked |
|
447 | M content1_content2_content3_content4-tracked | |
449 | <<<<<<< local: 0447570f1af6 - test: local |
|
448 | <<<<<<< local: 0447570f1af6 - test: local | |
450 | content4 |
|
449 | content4 | |
451 | ||||||| base |
|
450 | ||||||| base | |
452 | content1 |
|
451 | content1 | |
453 | ======= |
|
452 | ======= | |
454 | content2 |
|
453 | content2 | |
455 | >>>>>>> other: 85100b8c675b - test: remote |
|
454 | >>>>>>> other: 85100b8c675b - test: remote | |
456 |
|
455 | |||
457 | M content1_content2_content3_content4-untracked |
|
456 | M content1_content2_content3_content4-untracked | |
458 | content2 |
|
457 | content2 | |
459 |
|
458 | |||
460 | M content1_content2_content3_missing-tracked |
|
459 | M content1_content2_content3_missing-tracked | |
461 | content2 |
|
460 | content2 | |
462 |
|
461 | |||
463 | M content1_content2_content3_missing-untracked |
|
462 | M content1_content2_content3_missing-untracked | |
464 | content2 |
|
463 | content2 | |
465 |
|
464 | |||
466 | M content1_content2_missing_content1-tracked |
|
465 | M content1_content2_missing_content1-tracked | |
467 | content2 |
|
466 | content2 | |
468 |
|
467 | |||
469 | M content1_content2_missing_content1-untracked |
|
468 | M content1_content2_missing_content1-untracked | |
470 | content2 |
|
469 | content2 | |
471 |
|
470 | |||
472 | M content1_content2_missing_content2-tracked |
|
471 | M content1_content2_missing_content2-tracked | |
473 | content2 |
|
472 | content2 | |
474 |
|
473 | |||
475 | M content1_content2_missing_content2-untracked |
|
474 | M content1_content2_missing_content2-untracked | |
476 | content2 |
|
475 | content2 | |
477 |
|
476 | |||
478 | M content1_content2_missing_content4-tracked |
|
477 | M content1_content2_missing_content4-tracked | |
479 | <<<<<<< local: 0447570f1af6 - test: local |
|
478 | <<<<<<< local: 0447570f1af6 - test: local | |
480 | content4 |
|
479 | content4 | |
481 | ||||||| base |
|
480 | ||||||| base | |
482 | content1 |
|
481 | content1 | |
483 | ======= |
|
482 | ======= | |
484 | content2 |
|
483 | content2 | |
485 | >>>>>>> other: 85100b8c675b - test: remote |
|
484 | >>>>>>> other: 85100b8c675b - test: remote | |
486 |
|
485 | |||
487 | M content1_content2_missing_content4-untracked |
|
486 | M content1_content2_missing_content4-untracked | |
488 | content2 |
|
487 | content2 | |
489 |
|
488 | |||
490 | M content1_content2_missing_missing-tracked |
|
489 | M content1_content2_missing_missing-tracked | |
491 | content2 |
|
490 | content2 | |
492 |
|
491 | |||
493 | M content1_content2_missing_missing-untracked |
|
492 | M content1_content2_missing_missing-untracked | |
494 | content2 |
|
493 | content2 | |
495 |
|
494 | |||
496 | R content1_missing_content1_content1-tracked |
|
495 | R content1_missing_content1_content1-tracked | |
497 | <missing> |
|
496 | <missing> | |
498 |
|
497 | |||
499 | R content1_missing_content1_content1-untracked |
|
498 | R content1_missing_content1_content1-untracked | |
500 | content1 |
|
499 | content1 | |
501 |
|
500 | |||
502 | M content1_missing_content1_content4-tracked |
|
501 | M content1_missing_content1_content4-tracked | |
503 | content4 |
|
502 | content4 | |
504 |
|
503 | |||
505 | R content1_missing_content1_content4-untracked |
|
504 | R content1_missing_content1_content4-untracked | |
506 | content4 |
|
505 | content4 | |
507 |
|
506 | |||
508 | R content1_missing_content1_missing-tracked |
|
507 | R content1_missing_content1_missing-tracked | |
509 | <missing> |
|
508 | <missing> | |
510 |
|
509 | |||
511 | R content1_missing_content1_missing-untracked |
|
510 | R content1_missing_content1_missing-untracked | |
512 | <missing> |
|
511 | <missing> | |
513 |
|
512 | |||
514 | R content1_missing_content3_content1-tracked |
|
513 | R content1_missing_content3_content1-tracked | |
515 | <missing> |
|
514 | <missing> | |
516 |
|
515 | |||
517 | R content1_missing_content3_content1-untracked |
|
516 | R content1_missing_content3_content1-untracked | |
518 | content1 |
|
517 | content1 | |
519 |
|
518 | |||
520 | C content1_missing_content3_content3-tracked |
|
519 | C content1_missing_content3_content3-tracked | |
521 | content3 |
|
520 | content3 | |
522 |
|
521 | |||
523 | R content1_missing_content3_content3-untracked |
|
522 | R content1_missing_content3_content3-untracked | |
524 | content3 |
|
523 | content3 | |
525 |
|
524 | |||
526 | M content1_missing_content3_content4-tracked |
|
525 | M content1_missing_content3_content4-tracked | |
527 | content4 |
|
526 | content4 | |
528 |
|
527 | |||
529 | R content1_missing_content3_content4-untracked |
|
528 | R content1_missing_content3_content4-untracked | |
530 | content4 |
|
529 | content4 | |
531 |
|
530 | |||
532 | R content1_missing_content3_missing-tracked |
|
531 | R content1_missing_content3_missing-tracked | |
533 | <missing> |
|
532 | <missing> | |
534 |
|
533 | |||
535 | R content1_missing_content3_missing-untracked |
|
534 | R content1_missing_content3_missing-untracked | |
536 | <missing> |
|
535 | <missing> | |
537 |
|
536 | |||
538 | R content1_missing_missing_content1-tracked |
|
537 | R content1_missing_missing_content1-tracked | |
539 | <missing> |
|
538 | <missing> | |
540 |
|
539 | |||
541 | ? content1_missing_missing_content1-untracked |
|
540 | ? content1_missing_missing_content1-untracked | |
542 | content1 |
|
541 | content1 | |
543 |
|
542 | |||
544 | A content1_missing_missing_content4-tracked |
|
543 | A content1_missing_missing_content4-tracked | |
545 | content4 |
|
544 | content4 | |
546 |
|
545 | |||
547 | ? content1_missing_missing_content4-untracked |
|
546 | ? content1_missing_missing_content4-untracked | |
548 | content4 |
|
547 | content4 | |
549 |
|
548 | |||
550 | R content1_missing_missing_missing-tracked |
|
549 | R content1_missing_missing_missing-tracked | |
551 | <missing> |
|
550 | <missing> | |
552 |
|
551 | |||
553 | content1_missing_missing_missing-untracked: * (glob) |
|
552 | content1_missing_missing_missing-untracked: * (glob) | |
554 | <missing> |
|
553 | <missing> | |
555 |
|
554 | |||
556 | C missing_content2_content2_content2-tracked |
|
555 | C missing_content2_content2_content2-tracked | |
557 | content2 |
|
556 | content2 | |
558 |
|
557 | |||
559 | M missing_content2_content2_content2-untracked |
|
558 | M missing_content2_content2_content2-untracked | |
560 | content2 |
|
559 | content2 | |
561 |
|
560 | |||
562 | M missing_content2_content2_content4-tracked |
|
561 | M missing_content2_content2_content4-tracked | |
563 | <<<<<<< local: 0447570f1af6 - test: local |
|
562 | <<<<<<< local: 0447570f1af6 - test: local | |
564 | content4 |
|
563 | content4 | |
565 | ||||||| base |
|
564 | ||||||| base | |
566 | ======= |
|
565 | ======= | |
567 | content2 |
|
566 | content2 | |
568 | >>>>>>> other: 85100b8c675b - test: remote |
|
567 | >>>>>>> other: 85100b8c675b - test: remote | |
569 |
|
568 | |||
570 | M missing_content2_content2_content4-untracked |
|
569 | M missing_content2_content2_content4-untracked | |
571 | content2 |
|
570 | content2 | |
572 |
|
571 | |||
573 | M missing_content2_content2_missing-tracked |
|
572 | M missing_content2_content2_missing-tracked | |
574 | content2 |
|
573 | content2 | |
575 |
|
574 | |||
576 | M missing_content2_content2_missing-untracked |
|
575 | M missing_content2_content2_missing-untracked | |
577 | content2 |
|
576 | content2 | |
578 |
|
577 | |||
579 | M missing_content2_content3_content2-tracked |
|
578 | M missing_content2_content3_content2-tracked | |
580 | content2 |
|
579 | content2 | |
581 |
|
580 | |||
582 | M missing_content2_content3_content2-untracked |
|
581 | M missing_content2_content3_content2-untracked | |
583 | content2 |
|
582 | content2 | |
584 |
|
583 | |||
585 | M missing_content2_content3_content3-tracked |
|
584 | M missing_content2_content3_content3-tracked | |
586 | <<<<<<< local: 0447570f1af6 - test: local |
|
585 | <<<<<<< local: 0447570f1af6 - test: local | |
587 | content3 |
|
586 | content3 | |
588 | ||||||| base |
|
587 | ||||||| base | |
589 | ======= |
|
588 | ======= | |
590 | content2 |
|
589 | content2 | |
591 | >>>>>>> other: 85100b8c675b - test: remote |
|
590 | >>>>>>> other: 85100b8c675b - test: remote | |
592 |
|
591 | |||
593 | M missing_content2_content3_content3-untracked |
|
592 | M missing_content2_content3_content3-untracked | |
594 | content2 |
|
593 | content2 | |
595 |
|
594 | |||
596 | M missing_content2_content3_content4-tracked |
|
595 | M missing_content2_content3_content4-tracked | |
597 | <<<<<<< local: 0447570f1af6 - test: local |
|
596 | <<<<<<< local: 0447570f1af6 - test: local | |
598 | content4 |
|
597 | content4 | |
599 | ||||||| base |
|
598 | ||||||| base | |
600 | ======= |
|
599 | ======= | |
601 | content2 |
|
600 | content2 | |
602 | >>>>>>> other: 85100b8c675b - test: remote |
|
601 | >>>>>>> other: 85100b8c675b - test: remote | |
603 |
|
602 | |||
604 | M missing_content2_content3_content4-untracked |
|
603 | M missing_content2_content3_content4-untracked | |
605 | content2 |
|
604 | content2 | |
606 |
|
605 | |||
607 | M missing_content2_content3_missing-tracked |
|
606 | M missing_content2_content3_missing-tracked | |
608 | content2 |
|
607 | content2 | |
609 |
|
608 | |||
610 | M missing_content2_content3_missing-untracked |
|
609 | M missing_content2_content3_missing-untracked | |
611 | content2 |
|
610 | content2 | |
612 |
|
611 | |||
613 | M missing_content2_missing_content2-tracked |
|
612 | M missing_content2_missing_content2-tracked | |
614 | content2 |
|
613 | content2 | |
615 |
|
614 | |||
616 | M missing_content2_missing_content2-untracked |
|
615 | M missing_content2_missing_content2-untracked | |
617 | content2 |
|
616 | content2 | |
618 |
|
617 | |||
619 | M missing_content2_missing_content4-tracked |
|
618 | M missing_content2_missing_content4-tracked | |
620 | <<<<<<< local: 0447570f1af6 - test: local |
|
619 | <<<<<<< local: 0447570f1af6 - test: local | |
621 | content4 |
|
620 | content4 | |
622 | ||||||| base |
|
621 | ||||||| base | |
623 | ======= |
|
622 | ======= | |
624 | content2 |
|
623 | content2 | |
625 | >>>>>>> other: 85100b8c675b - test: remote |
|
624 | >>>>>>> other: 85100b8c675b - test: remote | |
626 |
|
625 | |||
627 | M missing_content2_missing_content4-untracked |
|
626 | M missing_content2_missing_content4-untracked | |
628 | <<<<<<< local: 0447570f1af6 - test: local |
|
627 | <<<<<<< local: 0447570f1af6 - test: local | |
629 | content4 |
|
628 | content4 | |
630 | ||||||| base |
|
629 | ||||||| base | |
631 | ======= |
|
630 | ======= | |
632 | content2 |
|
631 | content2 | |
633 | >>>>>>> other: 85100b8c675b - test: remote |
|
632 | >>>>>>> other: 85100b8c675b - test: remote | |
634 |
|
633 | |||
635 | M missing_content2_missing_missing-tracked |
|
634 | M missing_content2_missing_missing-tracked | |
636 | content2 |
|
635 | content2 | |
637 |
|
636 | |||
638 | M missing_content2_missing_missing-untracked |
|
637 | M missing_content2_missing_missing-untracked | |
639 | content2 |
|
638 | content2 | |
640 |
|
639 | |||
641 | C missing_missing_content3_content3-tracked |
|
640 | C missing_missing_content3_content3-tracked | |
642 | content3 |
|
641 | content3 | |
643 |
|
642 | |||
644 | R missing_missing_content3_content3-untracked |
|
643 | R missing_missing_content3_content3-untracked | |
645 | content3 |
|
644 | content3 | |
646 |
|
645 | |||
647 | M missing_missing_content3_content4-tracked |
|
646 | M missing_missing_content3_content4-tracked | |
648 | content4 |
|
647 | content4 | |
649 |
|
648 | |||
650 | R missing_missing_content3_content4-untracked |
|
649 | R missing_missing_content3_content4-untracked | |
651 | content4 |
|
650 | content4 | |
652 |
|
651 | |||
653 | R missing_missing_content3_missing-tracked |
|
652 | R missing_missing_content3_missing-tracked | |
654 | <missing> |
|
653 | <missing> | |
655 |
|
654 | |||
656 | R missing_missing_content3_missing-untracked |
|
655 | R missing_missing_content3_missing-untracked | |
657 | <missing> |
|
656 | <missing> | |
658 |
|
657 | |||
659 | A missing_missing_missing_content4-tracked |
|
658 | A missing_missing_missing_content4-tracked | |
660 | content4 |
|
659 | content4 | |
661 |
|
660 | |||
662 | ? missing_missing_missing_content4-untracked |
|
661 | ? missing_missing_missing_content4-untracked | |
663 | content4 |
|
662 | content4 | |
664 |
|
663 | |||
665 | R missing_missing_missing_missing-tracked |
|
664 | R missing_missing_missing_missing-tracked | |
666 | <missing> |
|
665 | <missing> | |
667 |
|
666 | |||
668 | missing_missing_missing_missing-untracked: * (glob) |
|
667 | missing_missing_missing_missing-untracked: * (glob) | |
669 | <missing> |
|
668 | <missing> | |
670 |
|
669 | |||
671 | $ for f in `python $TESTDIR/generate-working-copy-states.py filelist 3` |
|
670 | $ for f in `python $TESTDIR/generate-working-copy-states.py filelist 3` | |
672 | > do |
|
671 | > do | |
673 | > if test -f ${f}.orig |
|
672 | > if test -f ${f}.orig | |
674 | > then |
|
673 | > then | |
675 | > echo ${f}.orig: |
|
674 | > echo ${f}.orig: | |
676 | > cat ${f}.orig |
|
675 | > cat ${f}.orig | |
677 | > fi |
|
676 | > fi | |
678 | > done |
|
677 | > done | |
679 | content1_content2_content1_content4-tracked.orig: |
|
678 | content1_content2_content1_content4-tracked.orig: | |
680 | content4 |
|
679 | content4 | |
681 | content1_content2_content2_content4-tracked.orig: |
|
680 | content1_content2_content2_content4-tracked.orig: | |
682 | content4 |
|
681 | content4 | |
683 | content1_content2_content3_content3-tracked.orig: |
|
682 | content1_content2_content3_content3-tracked.orig: | |
684 | content3 |
|
683 | content3 | |
685 | content1_content2_content3_content4-tracked.orig: |
|
684 | content1_content2_content3_content4-tracked.orig: | |
686 | content4 |
|
685 | content4 | |
687 | content1_content2_missing_content4-tracked.orig: |
|
686 | content1_content2_missing_content4-tracked.orig: | |
688 | content4 |
|
687 | content4 | |
689 | missing_content2_content2_content4-tracked.orig: |
|
688 | missing_content2_content2_content4-tracked.orig: | |
690 | content4 |
|
689 | content4 | |
691 | missing_content2_content3_content3-tracked.orig: |
|
690 | missing_content2_content3_content3-tracked.orig: | |
692 | content3 |
|
691 | content3 | |
693 | missing_content2_content3_content4-tracked.orig: |
|
692 | missing_content2_content3_content4-tracked.orig: | |
694 | content4 |
|
693 | content4 | |
695 | missing_content2_missing_content4-tracked.orig: |
|
694 | missing_content2_missing_content4-tracked.orig: | |
696 | content4 |
|
695 | content4 | |
697 | missing_content2_missing_content4-untracked.orig: |
|
696 | missing_content2_missing_content4-untracked.orig: | |
698 | content4 |
|
697 | content4 | |
699 |
|
698 | |||
700 | Re-resolve and check status |
|
699 | Re-resolve and check status | |
701 |
|
700 | |||
702 | $ hg resolve --unmark --all |
|
701 | $ hg resolve --unmark --all | |
703 | $ hg resolve --all --tool :local |
|
702 | $ hg resolve --all --tool :local | |
704 | (no more unresolved files) |
|
703 | (no more unresolved files) | |
705 | $ hg resolve --unmark --all |
|
704 | $ hg resolve --unmark --all | |
706 | $ hg resolve --all --tool internal:merge3 |
|
705 | $ hg resolve --all --tool internal:merge3 | |
707 | remote changed content1_content2_content1_content1-untracked which local deleted |
|
706 | remote changed content1_content2_content1_content1-untracked which local deleted | |
708 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
707 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
709 | remote changed content1_content2_content1_content2-untracked which local deleted |
|
708 | remote changed content1_content2_content1_content2-untracked which local deleted | |
710 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
709 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
711 | merging content1_content2_content1_content4-tracked |
|
710 | merging content1_content2_content1_content4-tracked | |
712 | remote changed content1_content2_content1_content4-untracked which local deleted |
|
711 | remote changed content1_content2_content1_content4-untracked which local deleted | |
713 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
712 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
714 | remote changed content1_content2_content1_missing-tracked which local deleted |
|
713 | remote changed content1_content2_content1_missing-tracked which local deleted | |
715 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
714 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
716 | remote changed content1_content2_content1_missing-untracked which local deleted |
|
715 | remote changed content1_content2_content1_missing-untracked which local deleted | |
717 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
716 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
718 | merging content1_content2_content2_content1-tracked |
|
717 | merging content1_content2_content2_content1-tracked | |
719 | remote changed content1_content2_content2_content1-untracked which local deleted |
|
718 | remote changed content1_content2_content2_content1-untracked which local deleted | |
720 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
719 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
721 | remote changed content1_content2_content2_content2-untracked which local deleted |
|
720 | remote changed content1_content2_content2_content2-untracked which local deleted | |
722 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
721 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
723 | merging content1_content2_content2_content4-tracked |
|
722 | merging content1_content2_content2_content4-tracked | |
724 | remote changed content1_content2_content2_content4-untracked which local deleted |
|
723 | remote changed content1_content2_content2_content4-untracked which local deleted | |
725 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
724 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
726 | remote changed content1_content2_content2_missing-tracked which local deleted |
|
725 | remote changed content1_content2_content2_missing-tracked which local deleted | |
727 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
726 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
728 | remote changed content1_content2_content2_missing-untracked which local deleted |
|
727 | remote changed content1_content2_content2_missing-untracked which local deleted | |
729 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
728 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
730 | merging content1_content2_content3_content1-tracked |
|
729 | merging content1_content2_content3_content1-tracked | |
731 | remote changed content1_content2_content3_content1-untracked which local deleted |
|
730 | remote changed content1_content2_content3_content1-untracked which local deleted | |
732 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
731 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
733 | remote changed content1_content2_content3_content2-untracked which local deleted |
|
732 | remote changed content1_content2_content3_content2-untracked which local deleted | |
734 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
733 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
735 | merging content1_content2_content3_content3-tracked |
|
734 | merging content1_content2_content3_content3-tracked | |
736 | remote changed content1_content2_content3_content3-untracked which local deleted |
|
735 | remote changed content1_content2_content3_content3-untracked which local deleted | |
737 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
736 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
738 | merging content1_content2_content3_content4-tracked |
|
737 | merging content1_content2_content3_content4-tracked | |
739 | remote changed content1_content2_content3_content4-untracked which local deleted |
|
738 | remote changed content1_content2_content3_content4-untracked which local deleted | |
740 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
739 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
741 | remote changed content1_content2_content3_missing-tracked which local deleted |
|
740 | remote changed content1_content2_content3_missing-tracked which local deleted | |
742 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
741 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
743 | remote changed content1_content2_content3_missing-untracked which local deleted |
|
742 | remote changed content1_content2_content3_missing-untracked which local deleted | |
744 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
743 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
745 | merging content1_content2_missing_content1-tracked |
|
744 | merging content1_content2_missing_content1-tracked | |
746 | remote changed content1_content2_missing_content1-untracked which local deleted |
|
745 | remote changed content1_content2_missing_content1-untracked which local deleted | |
747 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
746 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
748 | remote changed content1_content2_missing_content2-untracked which local deleted |
|
747 | remote changed content1_content2_missing_content2-untracked which local deleted | |
749 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
748 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
750 | merging content1_content2_missing_content4-tracked |
|
749 | merging content1_content2_missing_content4-tracked | |
751 | remote changed content1_content2_missing_content4-untracked which local deleted |
|
750 | remote changed content1_content2_missing_content4-untracked which local deleted | |
752 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
751 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
753 | remote changed content1_content2_missing_missing-tracked which local deleted |
|
752 | remote changed content1_content2_missing_missing-tracked which local deleted | |
754 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
753 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
755 | remote changed content1_content2_missing_missing-untracked which local deleted |
|
754 | remote changed content1_content2_missing_missing-untracked which local deleted | |
756 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
755 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
757 | local changed content1_missing_content1_content4-tracked which remote deleted |
|
756 | local changed content1_missing_content1_content4-tracked which remote deleted | |
758 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
757 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
759 | local changed content1_missing_content3_content3-tracked which remote deleted |
|
758 | local changed content1_missing_content3_content3-tracked which remote deleted | |
760 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
759 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
761 | local changed content1_missing_content3_content4-tracked which remote deleted |
|
760 | local changed content1_missing_content3_content4-tracked which remote deleted | |
762 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
761 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
763 | local changed content1_missing_missing_content4-tracked which remote deleted |
|
762 | local changed content1_missing_missing_content4-tracked which remote deleted | |
764 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
763 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
765 | merging missing_content2_content2_content4-tracked |
|
764 | merging missing_content2_content2_content4-tracked | |
766 | merging missing_content2_content3_content3-tracked |
|
765 | merging missing_content2_content3_content3-tracked | |
767 | merging missing_content2_content3_content4-tracked |
|
766 | merging missing_content2_content3_content4-tracked | |
768 | merging missing_content2_missing_content4-tracked |
|
767 | merging missing_content2_missing_content4-tracked | |
769 | merging missing_content2_missing_content4-untracked |
|
768 | merging missing_content2_missing_content4-untracked | |
770 | warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark') |
|
769 | warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark') | |
771 | warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
|
770 | warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') | |
772 | warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
|
771 | warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') | |
773 | warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
|
772 | warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') | |
774 | warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
|
773 | warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') | |
775 | warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
|
774 | warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') | |
776 | warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
|
775 | warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') | |
777 | warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
|
776 | warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') | |
778 | warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
|
777 | warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') | |
779 | warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') |
|
778 | warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') | |
780 | [1] |
|
779 | [1] | |
781 | $ checkstatus > $TESTTMP/status2 2>&1 |
|
780 | $ checkstatus > $TESTTMP/status2 2>&1 | |
782 | $ cmp $TESTTMP/status1 $TESTTMP/status2 || diff -U8 $TESTTMP/status1 $TESTTMP/status2 |
|
781 | $ cmp $TESTTMP/status1 $TESTTMP/status2 || diff -U8 $TESTTMP/status1 $TESTTMP/status2 | |
|
782 | ||||
|
783 | Set up working directory again | |||
|
784 | ||||
|
785 | $ hg -q update --clean 2 | |||
|
786 | $ hg --config extensions.purge= purge | |||
|
787 | $ python $TESTDIR/generate-working-copy-states.py state 3 wc | |||
|
788 | $ hg addremove -q --similarity 0 | |||
|
789 | $ hg forget *_*_*_*-untracked | |||
|
790 | $ rm *_*_*_missing-* | |||
|
791 | ||||
|
792 | Merge with checkunknown = warn, see that behavior is the same as before | |||
|
793 | $ hg merge -f --tool internal:merge3 'desc("remote")' --config merge.checkunknown=warn > $TESTTMP/merge-output-2 2>&1 | |||
|
794 | [1] | |||
|
795 | $ cmp $TESTTMP/merge-output-1 $TESTTMP/merge-output-2 || diff -U8 $TESTTMP/merge-output-1 $TESTTMP/merge-output-2 |
General Comments 0
You need to be logged in to leave comments.
Login now