Show More
@@ -1,424 +1,429 b'' | |||||
1 | $ cat <<EOF > merge |
|
1 | $ cat <<EOF > merge | |
2 | > from __future__ import print_function |
|
2 | > from __future__ import print_function | |
3 | > import sys, os |
|
3 | > import sys, os | |
4 | > |
|
4 | > | |
5 | > try: |
|
5 | > try: | |
6 | > import msvcrt |
|
6 | > import msvcrt | |
7 | > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) |
|
7 | > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) | |
8 | > msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) |
|
8 | > msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) | |
9 | > except ImportError: |
|
9 | > except ImportError: | |
10 | > pass |
|
10 | > pass | |
11 | > |
|
11 | > | |
12 | > print("merging for", os.path.basename(sys.argv[1])) |
|
12 | > print("merging for", os.path.basename(sys.argv[1])) | |
13 | > EOF |
|
13 | > EOF | |
14 | $ HGMERGE="$PYTHON ../merge"; export HGMERGE |
|
14 | $ HGMERGE="$PYTHON ../merge"; export HGMERGE | |
15 |
|
15 | |||
16 | $ hg init t |
|
16 | $ hg init t | |
17 | $ cd t |
|
17 | $ cd t | |
18 | $ echo This is file a1 > a |
|
18 | $ echo This is file a1 > a | |
19 | $ hg add a |
|
19 | $ hg add a | |
20 | $ hg commit -m "commit #0" |
|
20 | $ hg commit -m "commit #0" | |
21 | $ echo This is file b1 > b |
|
21 | $ echo This is file b1 > b | |
22 | $ hg add b |
|
22 | $ hg add b | |
23 | $ hg commit -m "commit #1" |
|
23 | $ hg commit -m "commit #1" | |
24 |
|
24 | |||
25 | $ hg update 0 |
|
25 | $ hg update 0 | |
26 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
26 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
27 |
|
27 | |||
28 | Test interrupted updates by having a non-empty dir with the same name as one |
|
28 | Test interrupted updates by having a non-empty dir with the same name as one | |
29 | of the files in a commit we're updating to |
|
29 | of the files in a commit we're updating to | |
30 |
|
30 | |||
31 | $ mkdir b && touch b/nonempty |
|
31 | $ mkdir b && touch b/nonempty | |
32 | $ hg up |
|
32 | $ hg up | |
33 | abort: *: '$TESTTMP/t/b' (glob) |
|
33 | abort: *: '$TESTTMP/t/b' (glob) | |
34 | [255] |
|
34 | [255] | |
35 | $ hg ci |
|
35 | $ hg ci | |
36 | abort: last update was interrupted |
|
36 | abort: last update was interrupted | |
37 | (use 'hg update' to get a consistent checkout) |
|
37 | (use 'hg update' to get a consistent checkout) | |
38 | [255] |
|
38 | [255] | |
39 | $ hg sum |
|
39 | $ hg sum | |
40 | parent: 0:538afb845929 |
|
40 | parent: 0:538afb845929 | |
41 | commit #0 |
|
41 | commit #0 | |
42 | branch: default |
|
42 | branch: default | |
43 | commit: 1 unknown (interrupted update) |
|
43 | commit: 1 unknown (interrupted update) | |
44 | update: 1 new changesets (update) |
|
44 | update: 1 new changesets (update) | |
45 | phases: 2 draft |
|
45 | phases: 2 draft | |
46 | $ rm b/nonempty |
|
46 | $ rm b/nonempty | |
47 | $ hg up |
|
47 | $ hg up | |
48 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
48 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
49 | $ hg sum |
|
49 | $ hg sum | |
50 | parent: 1:b8bb4a988f25 tip |
|
50 | parent: 1:b8bb4a988f25 tip | |
51 | commit #1 |
|
51 | commit #1 | |
52 | branch: default |
|
52 | branch: default | |
53 | commit: (clean) |
|
53 | commit: (clean) | |
54 | update: (current) |
|
54 | update: (current) | |
55 | phases: 2 draft |
|
55 | phases: 2 draft | |
56 |
|
56 | |||
57 | Prepare a basic merge |
|
57 | Prepare a basic merge | |
58 |
|
58 | |||
59 | $ hg up 0 |
|
59 | $ hg up 0 | |
60 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
60 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
61 | $ echo This is file c1 > c |
|
61 | $ echo This is file c1 > c | |
62 | $ hg add c |
|
62 | $ hg add c | |
63 | $ hg commit -m "commit #2" |
|
63 | $ hg commit -m "commit #2" | |
64 | created new head |
|
64 | created new head | |
65 | $ echo This is file b1 > b |
|
65 | $ echo This is file b1 > b | |
66 | no merges expected |
|
66 | no merges expected | |
67 | $ hg merge -P 1 |
|
67 | $ hg merge -P 1 | |
68 | changeset: 1:b8bb4a988f25 |
|
68 | changeset: 1:b8bb4a988f25 | |
69 | user: test |
|
69 | user: test | |
70 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
70 | date: Thu Jan 01 00:00:00 1970 +0000 | |
71 | summary: commit #1 |
|
71 | summary: commit #1 | |
72 |
|
72 | |||
73 | $ hg merge 1 |
|
73 | $ hg merge 1 | |
74 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
74 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
75 | (branch merge, don't forget to commit) |
|
75 | (branch merge, don't forget to commit) | |
76 | $ hg diff --nodates |
|
76 | $ hg diff --nodates | |
77 | diff -r 49035e18a8e6 b |
|
77 | diff -r 49035e18a8e6 b | |
78 | --- /dev/null |
|
78 | --- /dev/null | |
79 | +++ b/b |
|
79 | +++ b/b | |
80 | @@ -0,0 +1,1 @@ |
|
80 | @@ -0,0 +1,1 @@ | |
81 | +This is file b1 |
|
81 | +This is file b1 | |
82 | $ hg status |
|
82 | $ hg status | |
83 | M b |
|
83 | M b | |
84 | $ cd ..; rm -r t |
|
84 | $ cd ..; rm -r t | |
85 |
|
85 | |||
86 | $ hg init t |
|
86 | $ hg init t | |
87 | $ cd t |
|
87 | $ cd t | |
88 | $ echo This is file a1 > a |
|
88 | $ echo This is file a1 > a | |
89 | $ hg add a |
|
89 | $ hg add a | |
90 | $ hg commit -m "commit #0" |
|
90 | $ hg commit -m "commit #0" | |
91 | $ echo This is file b1 > b |
|
91 | $ echo This is file b1 > b | |
92 | $ hg add b |
|
92 | $ hg add b | |
93 | $ hg commit -m "commit #1" |
|
93 | $ hg commit -m "commit #1" | |
94 |
|
94 | |||
95 | $ hg update 0 |
|
95 | $ hg update 0 | |
96 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
96 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
97 | $ echo This is file c1 > c |
|
97 | $ echo This is file c1 > c | |
98 | $ hg add c |
|
98 | $ hg add c | |
99 | $ hg commit -m "commit #2" |
|
99 | $ hg commit -m "commit #2" | |
100 | created new head |
|
100 | created new head | |
101 | $ echo This is file b2 > b |
|
101 | $ echo This is file b2 > b | |
102 | merge should fail |
|
102 | merge should fail | |
103 | $ hg merge 1 |
|
103 | $ hg merge 1 | |
104 | b: untracked file differs |
|
104 | b: untracked file differs | |
105 | abort: untracked files in working directory differ from files in requested revision |
|
105 | abort: untracked files in working directory differ from files in requested revision | |
106 | [255] |
|
106 | [255] | |
107 |
|
107 | |||
108 | #if symlink |
|
108 | #if symlink | |
109 | symlinks to directories should be treated as regular files (issue5027) |
|
109 | symlinks to directories should be treated as regular files (issue5027) | |
110 | $ rm b |
|
110 | $ rm b | |
111 | $ ln -s 'This is file b2' b |
|
111 | $ ln -s 'This is file b2' b | |
112 | $ hg merge 1 |
|
112 | $ hg merge 1 | |
113 | b: untracked file differs |
|
113 | b: untracked file differs | |
114 | abort: untracked files in working directory differ from files in requested revision |
|
114 | abort: untracked files in working directory differ from files in requested revision | |
115 | [255] |
|
115 | [255] | |
116 | symlinks shouldn't be followed |
|
116 | symlinks shouldn't be followed | |
117 | $ rm b |
|
117 | $ rm b | |
118 | $ echo This is file b1 > .hg/b |
|
118 | $ echo This is file b1 > .hg/b | |
119 | $ ln -s .hg/b b |
|
119 | $ ln -s .hg/b b | |
120 | $ hg merge 1 |
|
120 | $ hg merge 1 | |
121 | b: untracked file differs |
|
121 | b: untracked file differs | |
122 | abort: untracked files in working directory differ from files in requested revision |
|
122 | abort: untracked files in working directory differ from files in requested revision | |
123 | [255] |
|
123 | [255] | |
124 |
|
124 | |||
125 | $ rm b |
|
125 | $ rm b | |
126 | $ echo This is file b2 > b |
|
126 | $ echo This is file b2 > b | |
127 | #endif |
|
127 | #endif | |
128 |
|
128 | |||
129 | bad config |
|
129 | bad config | |
130 | $ hg merge 1 --config merge.checkunknown=x |
|
130 | $ hg merge 1 --config merge.checkunknown=x | |
131 | abort: merge.checkunknown not valid ('x' is none of 'abort', 'ignore', 'warn') |
|
131 | abort: merge.checkunknown not valid ('x' is none of 'abort', 'ignore', 'warn') | |
132 | [255] |
|
132 | [255] | |
133 | this merge should fail |
|
133 | this merge should fail | |
134 | $ hg merge 1 --config merge.checkunknown=abort |
|
134 | $ hg merge 1 --config merge.checkunknown=abort | |
135 | b: untracked file differs |
|
135 | b: untracked file differs | |
136 | abort: untracked files in working directory differ from files in requested revision |
|
136 | abort: untracked files in working directory differ from files in requested revision | |
137 | [255] |
|
137 | [255] | |
138 |
|
138 | |||
139 | this merge should warn |
|
139 | this merge should warn | |
140 | $ hg merge 1 --config merge.checkunknown=warn |
|
140 | $ hg merge 1 --config merge.checkunknown=warn | |
141 | b: replacing untracked file |
|
141 | b: replacing untracked file | |
142 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
142 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
143 | (branch merge, don't forget to commit) |
|
143 | (branch merge, don't forget to commit) | |
144 | $ cat b.orig |
|
144 | $ cat b.orig | |
145 | This is file b2 |
|
145 | This is file b2 | |
146 | $ hg up --clean 2 |
|
146 | $ hg up --clean 2 | |
147 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
147 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
148 | $ mv b.orig b |
|
148 | $ mv b.orig b | |
149 |
|
149 | |||
150 | this merge should silently ignore |
|
150 | this merge should silently ignore | |
151 | $ cat b |
|
151 | $ cat b | |
152 | This is file b2 |
|
152 | This is file b2 | |
153 | $ hg merge 1 --config merge.checkunknown=ignore |
|
153 | $ hg merge 1 --config merge.checkunknown=ignore | |
154 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
154 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
155 | (branch merge, don't forget to commit) |
|
155 | (branch merge, don't forget to commit) | |
156 |
|
156 | |||
157 | merge.checkignored |
|
157 | merge.checkignored | |
158 | $ hg up --clean 1 |
|
158 | $ hg up --clean 1 | |
159 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
159 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
160 | $ cat >> .hgignore << EOF |
|
160 | $ cat >> .hgignore << EOF | |
161 | > remoteignored |
|
161 | > remoteignored | |
162 | > EOF |
|
162 | > EOF | |
163 | $ echo This is file localignored3 > localignored |
|
163 | $ echo This is file localignored3 > localignored | |
164 | $ echo This is file remoteignored3 > remoteignored |
|
164 | $ echo This is file remoteignored3 > remoteignored | |
165 | $ hg add .hgignore localignored remoteignored |
|
165 | $ hg add .hgignore localignored remoteignored | |
166 | $ hg commit -m "commit #3" |
|
166 | $ hg commit -m "commit #3" | |
167 |
|
167 | |||
168 | $ hg up 2 |
|
168 | $ hg up 2 | |
169 | 1 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
169 | 1 files updated, 0 files merged, 4 files removed, 0 files unresolved | |
170 | $ cat >> .hgignore << EOF |
|
170 | $ cat >> .hgignore << EOF | |
171 | > localignored |
|
171 | > localignored | |
172 | > EOF |
|
172 | > EOF | |
173 | $ hg add .hgignore |
|
173 | $ hg add .hgignore | |
174 | $ hg commit -m "commit #4" |
|
174 | $ hg commit -m "commit #4" | |
175 |
|
175 | |||
176 | remote .hgignore shouldn't be used for determining whether a file is ignored |
|
176 | remote .hgignore shouldn't be used for determining whether a file is ignored | |
177 | $ echo This is file remoteignored4 > remoteignored |
|
177 | $ echo This is file remoteignored4 > remoteignored | |
178 | $ hg merge 3 --config merge.checkignored=ignore --config merge.checkunknown=abort |
|
178 | $ hg merge 3 --config merge.checkignored=ignore --config merge.checkunknown=abort | |
179 | remoteignored: untracked file differs |
|
179 | remoteignored: untracked file differs | |
180 | abort: untracked files in working directory differ from files in requested revision |
|
180 | abort: untracked files in working directory differ from files in requested revision | |
181 | [255] |
|
181 | [255] | |
182 | $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=ignore |
|
182 | $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=ignore | |
183 | merging .hgignore |
|
183 | merging .hgignore | |
184 | merging for .hgignore |
|
184 | merging for .hgignore | |
185 | 3 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
185 | 3 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
186 | (branch merge, don't forget to commit) |
|
186 | (branch merge, don't forget to commit) | |
187 | $ cat remoteignored |
|
187 | $ cat remoteignored | |
188 | This is file remoteignored3 |
|
188 | This is file remoteignored3 | |
189 | $ cat remoteignored.orig |
|
189 | $ cat remoteignored.orig | |
190 | This is file remoteignored4 |
|
190 | This is file remoteignored4 | |
191 | $ rm remoteignored.orig |
|
191 | $ rm remoteignored.orig | |
192 |
|
192 | |||
193 | local .hgignore should be used for that |
|
193 | local .hgignore should be used for that | |
194 | $ hg up --clean 4 |
|
194 | $ hg up --clean 4 | |
195 | 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
195 | 1 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
196 | $ echo This is file localignored4 > localignored |
|
196 | $ echo This is file localignored4 > localignored | |
197 | also test other conflicting files to see we output the full set of warnings |
|
197 | also test other conflicting files to see we output the full set of warnings | |
198 | $ echo This is file b2 > b |
|
198 | $ echo This is file b2 > b | |
199 | $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=abort |
|
199 | $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=abort | |
200 | b: untracked file differs |
|
200 | b: untracked file differs | |
201 | localignored: untracked file differs |
|
201 | localignored: untracked file differs | |
202 | abort: untracked files in working directory differ from files in requested revision |
|
202 | abort: untracked files in working directory differ from files in requested revision | |
203 | [255] |
|
203 | [255] | |
204 | $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=ignore |
|
204 | $ hg merge 3 --config merge.checkignored=abort --config merge.checkunknown=ignore | |
205 | localignored: untracked file differs |
|
205 | localignored: untracked file differs | |
206 | abort: untracked files in working directory differ from files in requested revision |
|
206 | abort: untracked files in working directory differ from files in requested revision | |
207 | [255] |
|
207 | [255] | |
208 | $ hg merge 3 --config merge.checkignored=warn --config merge.checkunknown=abort |
|
208 | $ hg merge 3 --config merge.checkignored=warn --config merge.checkunknown=abort | |
209 | b: untracked file differs |
|
209 | b: untracked file differs | |
210 | abort: untracked files in working directory differ from files in requested revision |
|
210 | abort: untracked files in working directory differ from files in requested revision | |
211 | [255] |
|
211 | [255] | |
212 | $ hg merge 3 --config merge.checkignored=warn --config merge.checkunknown=warn |
|
212 | $ hg merge 3 --config merge.checkignored=warn --config merge.checkunknown=warn | |
213 | b: replacing untracked file |
|
213 | b: replacing untracked file | |
214 | localignored: replacing untracked file |
|
214 | localignored: replacing untracked file | |
215 | merging .hgignore |
|
215 | merging .hgignore | |
216 | merging for .hgignore |
|
216 | merging for .hgignore | |
217 | 3 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
217 | 3 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
218 | (branch merge, don't forget to commit) |
|
218 | (branch merge, don't forget to commit) | |
219 | $ cat localignored |
|
219 | $ cat localignored | |
220 | This is file localignored3 |
|
220 | This is file localignored3 | |
221 | $ cat localignored.orig |
|
221 | $ cat localignored.orig | |
222 | This is file localignored4 |
|
222 | This is file localignored4 | |
223 | $ rm localignored.orig |
|
223 | $ rm localignored.orig | |
224 |
|
224 | |||
225 | $ cat b.orig |
|
225 | $ cat b.orig | |
226 | This is file b2 |
|
226 | This is file b2 | |
227 | $ hg up --clean 2 |
|
227 | $ hg up --clean 2 | |
228 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
228 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | |
229 | $ mv b.orig b |
|
229 | $ mv b.orig b | |
230 |
|
230 | |||
231 | this merge of b should work |
|
231 | this merge of b should work | |
232 | $ cat b |
|
232 | $ cat b | |
233 | This is file b2 |
|
233 | This is file b2 | |
234 | $ hg merge -f 1 |
|
234 | $ hg merge -f 1 | |
235 | merging b |
|
235 | merging b | |
236 | merging for b |
|
236 | merging for b | |
237 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
237 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
238 | (branch merge, don't forget to commit) |
|
238 | (branch merge, don't forget to commit) | |
239 | $ hg diff --nodates |
|
239 | $ hg diff --nodates | |
240 | diff -r 49035e18a8e6 b |
|
240 | diff -r 49035e18a8e6 b | |
241 | --- /dev/null |
|
241 | --- /dev/null | |
242 | +++ b/b |
|
242 | +++ b/b | |
243 | @@ -0,0 +1,1 @@ |
|
243 | @@ -0,0 +1,1 @@ | |
244 | +This is file b2 |
|
244 | +This is file b2 | |
245 | $ hg status |
|
245 | $ hg status | |
246 | M b |
|
246 | M b | |
247 | $ cd ..; rm -r t |
|
247 | $ cd ..; rm -r t | |
248 |
|
248 | |||
249 | $ hg init t |
|
249 | $ hg init t | |
250 | $ cd t |
|
250 | $ cd t | |
251 | $ echo This is file a1 > a |
|
251 | $ echo This is file a1 > a | |
252 | $ hg add a |
|
252 | $ hg add a | |
253 | $ hg commit -m "commit #0" |
|
253 | $ hg commit -m "commit #0" | |
254 | $ echo This is file b1 > b |
|
254 | $ echo This is file b1 > b | |
255 | $ hg add b |
|
255 | $ hg add b | |
256 | $ hg commit -m "commit #1" |
|
256 | $ hg commit -m "commit #1" | |
257 | $ echo This is file b22 > b |
|
257 | $ echo This is file b22 > b | |
258 | $ hg commit -m "commit #2" |
|
258 | $ hg commit -m "commit #2" | |
259 | $ hg update 1 |
|
259 | $ hg update 1 | |
260 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
260 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
261 | $ echo This is file c1 > c |
|
261 | $ echo This is file c1 > c | |
262 | $ hg add c |
|
262 | $ hg add c | |
263 | $ hg commit -m "commit #3" |
|
263 | $ hg commit -m "commit #3" | |
264 | created new head |
|
264 | created new head | |
265 |
|
265 | |||
266 | Contents of b should be "this is file b1" |
|
266 | Contents of b should be "this is file b1" | |
267 | $ cat b |
|
267 | $ cat b | |
268 | This is file b1 |
|
268 | This is file b1 | |
269 |
|
269 | |||
270 | $ echo This is file b22 > b |
|
270 | $ echo This is file b22 > b | |
271 | merge fails |
|
271 | merge fails | |
272 | $ hg merge 2 |
|
272 | $ hg merge 2 | |
273 | abort: uncommitted changes |
|
273 | abort: uncommitted changes | |
274 | (use 'hg status' to list changes) |
|
274 | (use 'hg status' to list changes) | |
275 | [255] |
|
275 | [255] | |
276 | merge expected! |
|
276 | merge expected! | |
277 | $ hg merge -f 2 |
|
277 | $ hg merge -f 2 | |
278 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
278 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
279 | (branch merge, don't forget to commit) |
|
279 | (branch merge, don't forget to commit) | |
280 | $ hg diff --nodates |
|
280 | $ hg diff --nodates | |
281 | diff -r 85de557015a8 b |
|
281 | diff -r 85de557015a8 b | |
282 | --- a/b |
|
282 | --- a/b | |
283 | +++ b/b |
|
283 | +++ b/b | |
284 | @@ -1,1 +1,1 @@ |
|
284 | @@ -1,1 +1,1 @@ | |
285 | -This is file b1 |
|
285 | -This is file b1 | |
286 | +This is file b22 |
|
286 | +This is file b22 | |
287 | $ hg status |
|
287 | $ hg status | |
288 | M b |
|
288 | M b | |
289 | $ cd ..; rm -r t |
|
289 | $ cd ..; rm -r t | |
290 |
|
290 | |||
291 | $ hg init t |
|
291 | $ hg init t | |
292 | $ cd t |
|
292 | $ cd t | |
293 | $ echo This is file a1 > a |
|
293 | $ echo This is file a1 > a | |
294 | $ hg add a |
|
294 | $ hg add a | |
295 | $ hg commit -m "commit #0" |
|
295 | $ hg commit -m "commit #0" | |
296 | $ echo This is file b1 > b |
|
296 | $ echo This is file b1 > b | |
297 | $ hg add b |
|
297 | $ hg add b | |
298 | $ hg commit -m "commit #1" |
|
298 | $ hg commit -m "commit #1" | |
299 | $ echo This is file b22 > b |
|
299 | $ echo This is file b22 > b | |
300 | $ hg commit -m "commit #2" |
|
300 | $ hg commit -m "commit #2" | |
301 | $ hg update 1 |
|
301 | $ hg update 1 | |
302 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
302 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
303 | $ echo This is file c1 > c |
|
303 | $ echo This is file c1 > c | |
304 | $ hg add c |
|
304 | $ hg add c | |
305 | $ hg commit -m "commit #3" |
|
305 | $ hg commit -m "commit #3" | |
306 | created new head |
|
306 | created new head | |
307 | $ echo This is file b33 > b |
|
307 | $ echo This is file b33 > b | |
308 | merge of b should fail |
|
308 | merge of b should fail | |
309 | $ hg merge 2 |
|
309 | $ hg merge 2 | |
310 | abort: uncommitted changes |
|
310 | abort: uncommitted changes | |
311 | (use 'hg status' to list changes) |
|
311 | (use 'hg status' to list changes) | |
312 | [255] |
|
312 | [255] | |
313 | merge of b expected |
|
313 | merge of b expected | |
314 | $ hg merge -f 2 |
|
314 | $ hg merge -f 2 | |
315 | merging b |
|
315 | merging b | |
316 | merging for b |
|
316 | merging for b | |
317 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
317 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
318 | (branch merge, don't forget to commit) |
|
318 | (branch merge, don't forget to commit) | |
319 | $ hg diff --nodates |
|
319 | $ hg diff --nodates | |
320 | diff -r 85de557015a8 b |
|
320 | diff -r 85de557015a8 b | |
321 | --- a/b |
|
321 | --- a/b | |
322 | +++ b/b |
|
322 | +++ b/b | |
323 | @@ -1,1 +1,1 @@ |
|
323 | @@ -1,1 +1,1 @@ | |
324 | -This is file b1 |
|
324 | -This is file b1 | |
325 | +This is file b33 |
|
325 | +This is file b33 | |
326 | $ hg status |
|
326 | $ hg status | |
327 | M b |
|
327 | M b | |
328 |
|
328 | |||
329 | Test for issue2364 |
|
329 | Test for issue2364 | |
330 |
|
330 | |||
331 | $ hg up -qC . |
|
331 | $ hg up -qC . | |
332 | $ hg rm b |
|
332 | $ hg rm b | |
333 | $ hg ci -md |
|
333 | $ hg ci -md | |
334 | $ hg revert -r -2 b |
|
334 | $ hg revert -r -2 b | |
335 | $ hg up -q -- -2 |
|
335 | $ hg up -q -- -2 | |
336 |
|
336 | |||
337 | Test that updated files are treated as "modified", when |
|
337 | Test that updated files are treated as "modified", when | |
338 | 'merge.update()' is aborted before 'merge.recordupdates()' (= parents |
|
338 | 'merge.update()' is aborted before 'merge.recordupdates()' (= parents | |
339 | aren't changed), even if none of mode, size and timestamp of them |
|
339 | aren't changed), even if none of mode, size and timestamp of them | |
340 | isn't changed on the filesystem (see also issue4583). |
|
340 | isn't changed on the filesystem (see also issue4583). | |
341 |
|
341 | |||
342 | $ cat > $TESTTMP/abort.py <<EOF |
|
342 | $ cat > $TESTTMP/abort.py <<EOF | |
|
343 | > from __future__ import absolute_import | |||
343 | > # emulate aborting before "recordupdates()". in this case, files |
|
344 | > # emulate aborting before "recordupdates()". in this case, files | |
344 | > # are changed without updating dirstate |
|
345 | > # are changed without updating dirstate | |
345 |
> from mercurial import |
|
346 | > from mercurial import ( | |
|
347 | > error, | |||
|
348 | > extensions, | |||
|
349 | > merge, | |||
|
350 | > ) | |||
346 | > def applyupdates(orig, *args, **kwargs): |
|
351 | > def applyupdates(orig, *args, **kwargs): | |
347 | > orig(*args, **kwargs) |
|
352 | > orig(*args, **kwargs) | |
348 | > raise error.Abort('intentional aborting') |
|
353 | > raise error.Abort('intentional aborting') | |
349 | > def extsetup(ui): |
|
354 | > def extsetup(ui): | |
350 | > extensions.wrapfunction(merge, "applyupdates", applyupdates) |
|
355 | > extensions.wrapfunction(merge, "applyupdates", applyupdates) | |
351 | > EOF |
|
356 | > EOF | |
352 |
|
357 | |||
353 | $ cat >> .hg/hgrc <<EOF |
|
358 | $ cat >> .hg/hgrc <<EOF | |
354 | > [fakedirstatewritetime] |
|
359 | > [fakedirstatewritetime] | |
355 | > # emulate invoking dirstate.write() via repo.status() |
|
360 | > # emulate invoking dirstate.write() via repo.status() | |
356 | > # at 2000-01-01 00:00 |
|
361 | > # at 2000-01-01 00:00 | |
357 | > fakenow = 200001010000 |
|
362 | > fakenow = 200001010000 | |
358 | > EOF |
|
363 | > EOF | |
359 |
|
364 | |||
360 | (file gotten from other revision) |
|
365 | (file gotten from other revision) | |
361 |
|
366 | |||
362 | $ hg update -q -C 2 |
|
367 | $ hg update -q -C 2 | |
363 | $ echo 'THIS IS FILE B5' > b |
|
368 | $ echo 'THIS IS FILE B5' > b | |
364 | $ hg commit -m 'commit #5' |
|
369 | $ hg commit -m 'commit #5' | |
365 |
|
370 | |||
366 | $ hg update -q -C 3 |
|
371 | $ hg update -q -C 3 | |
367 | $ cat b |
|
372 | $ cat b | |
368 | This is file b1 |
|
373 | This is file b1 | |
369 | $ touch -t 200001010000 b |
|
374 | $ touch -t 200001010000 b | |
370 | $ hg debugrebuildstate |
|
375 | $ hg debugrebuildstate | |
371 |
|
376 | |||
372 | $ cat >> .hg/hgrc <<EOF |
|
377 | $ cat >> .hg/hgrc <<EOF | |
373 | > [extensions] |
|
378 | > [extensions] | |
374 | > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py |
|
379 | > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py | |
375 | > abort = $TESTTMP/abort.py |
|
380 | > abort = $TESTTMP/abort.py | |
376 | > EOF |
|
381 | > EOF | |
377 | $ hg merge 5 |
|
382 | $ hg merge 5 | |
378 | abort: intentional aborting |
|
383 | abort: intentional aborting | |
379 | [255] |
|
384 | [255] | |
380 | $ cat >> .hg/hgrc <<EOF |
|
385 | $ cat >> .hg/hgrc <<EOF | |
381 | > [extensions] |
|
386 | > [extensions] | |
382 | > fakedirstatewritetime = ! |
|
387 | > fakedirstatewritetime = ! | |
383 | > abort = ! |
|
388 | > abort = ! | |
384 | > EOF |
|
389 | > EOF | |
385 |
|
390 | |||
386 | $ cat b |
|
391 | $ cat b | |
387 | THIS IS FILE B5 |
|
392 | THIS IS FILE B5 | |
388 | $ touch -t 200001010000 b |
|
393 | $ touch -t 200001010000 b | |
389 | $ hg status -A b |
|
394 | $ hg status -A b | |
390 | M b |
|
395 | M b | |
391 |
|
396 | |||
392 | (file merged from other revision) |
|
397 | (file merged from other revision) | |
393 |
|
398 | |||
394 | $ hg update -q -C 3 |
|
399 | $ hg update -q -C 3 | |
395 | $ echo 'this is file b6' > b |
|
400 | $ echo 'this is file b6' > b | |
396 | $ hg commit -m 'commit #6' |
|
401 | $ hg commit -m 'commit #6' | |
397 | created new head |
|
402 | created new head | |
398 |
|
403 | |||
399 | $ cat b |
|
404 | $ cat b | |
400 | this is file b6 |
|
405 | this is file b6 | |
401 | $ touch -t 200001010000 b |
|
406 | $ touch -t 200001010000 b | |
402 | $ hg debugrebuildstate |
|
407 | $ hg debugrebuildstate | |
403 |
|
408 | |||
404 | $ cat >> .hg/hgrc <<EOF |
|
409 | $ cat >> .hg/hgrc <<EOF | |
405 | > [extensions] |
|
410 | > [extensions] | |
406 | > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py |
|
411 | > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py | |
407 | > abort = $TESTTMP/abort.py |
|
412 | > abort = $TESTTMP/abort.py | |
408 | > EOF |
|
413 | > EOF | |
409 | $ hg merge --tool internal:other 5 |
|
414 | $ hg merge --tool internal:other 5 | |
410 | abort: intentional aborting |
|
415 | abort: intentional aborting | |
411 | [255] |
|
416 | [255] | |
412 | $ cat >> .hg/hgrc <<EOF |
|
417 | $ cat >> .hg/hgrc <<EOF | |
413 | > [extensions] |
|
418 | > [extensions] | |
414 | > fakedirstatewritetime = ! |
|
419 | > fakedirstatewritetime = ! | |
415 | > abort = ! |
|
420 | > abort = ! | |
416 | > EOF |
|
421 | > EOF | |
417 |
|
422 | |||
418 | $ cat b |
|
423 | $ cat b | |
419 | THIS IS FILE B5 |
|
424 | THIS IS FILE B5 | |
420 | $ touch -t 200001010000 b |
|
425 | $ touch -t 200001010000 b | |
421 | $ hg status -A b |
|
426 | $ hg status -A b | |
422 | M b |
|
427 | M b | |
423 |
|
428 | |||
424 | $ cd .. |
|
429 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now