Show More
@@ -106,8 +106,6 b' merge them (from the chmod side)' | |||||
106 | Removing the flag |
|
106 | Removing the flag | |
107 | ----------------- |
|
107 | ----------------- | |
108 |
|
108 | |||
109 | setup |
|
|||
110 |
|
||||
111 | Change on one side, executable bit on the other |
|
109 | Change on one side, executable bit on the other | |
112 |
|
110 | |||
113 | $ hg clone base-exec simple-merge-repo-removal |
|
111 | $ hg clone base-exec simple-merge-repo-removal | |
@@ -162,6 +160,9 b' merge them (from the chmod side)' | |||||
162 | Testing merging mode change with rename |
|
160 | Testing merging mode change with rename | |
163 | ======================================= |
|
161 | ======================================= | |
164 |
|
162 | |||
|
163 | Adding the flag | |||
|
164 | --------------- | |||
|
165 | ||||
165 | $ hg clone base-repo rename-merge-repo |
|
166 | $ hg clone base-repo rename-merge-repo | |
166 | updating to branch default |
|
167 | updating to branch default | |
167 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
168 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -213,10 +214,71 b' merge them (from the chmod side)' | |||||
213 |
|
214 | |||
214 | $ cd .. |
|
215 | $ cd .. | |
215 |
|
216 | |||
|
217 | Removing the flag | |||
|
218 | ----------------- | |||
|
219 | ||||
|
220 | $ hg clone base-exec rename-merge-repo-removal | |||
|
221 | updating to branch default | |||
|
222 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
223 | $ cd rename-merge-repo-removal | |||
|
224 | ||||
|
225 | make "a" non-executable on one side | |||
|
226 | ||||
|
227 | $ chmod -x a | |||
|
228 | $ hg status | |||
|
229 | M a | |||
|
230 | $ hg ci -m "make a non-executable" | |||
|
231 | $ [ -x a ] && echo "executable bit not removed" | |||
|
232 | [1] | |||
|
233 | $ hg up ".^" | |||
|
234 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
235 | ||||
|
236 | make "a" renamed on the other side | |||
|
237 | ||||
|
238 | $ hg mv a z | |||
|
239 | $ hg st --copies | |||
|
240 | A z | |||
|
241 | a | |||
|
242 | R a | |||
|
243 | $ hg ci -m "rename a to z" | |||
|
244 | created new head | |||
|
245 | ||||
|
246 | merge them (from the rename side) | |||
|
247 | ||||
|
248 | $ hg merge 'desc("make a non-executable")' | |||
|
249 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
250 | (branch merge, don't forget to commit) | |||
|
251 | $ hg st --copies | |||
|
252 | M z | |||
|
253 | a | |||
|
254 | $ [ -x z ] && echo "executable bit not removed" | |||
|
255 | [1] | |||
|
256 | ||||
|
257 | merge them (from the chmod side) | |||
|
258 | ||||
|
259 | $ hg up -C 'desc("make a non-executable")' | |||
|
260 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
261 | $ hg merge 'desc("rename a to z")' | |||
|
262 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
263 | (branch merge, don't forget to commit) | |||
|
264 | $ hg st --copies | |||
|
265 | M z | |||
|
266 | a | |||
|
267 | R a | |||
|
268 | $ [ -x z ] && echo "executable bit not removed" | |||
|
269 | [1] | |||
|
270 | ||||
|
271 | ||||
|
272 | $ cd .. | |||
|
273 | ||||
|
274 | ||||
216 | Testing merging mode change with rename + modification on both side |
|
275 | Testing merging mode change with rename + modification on both side | |
217 | =================================================================== |
|
276 | =================================================================== | |
218 |
|
277 | |||
219 |
|
278 | |||
|
279 | Adding the flag | |||
|
280 | --------------- | |||
|
281 | ||||
220 | $ hg clone base-repo rename+mod-merge-repo |
|
282 | $ hg clone base-repo rename+mod-merge-repo | |
221 | updating to branch default |
|
283 | updating to branch default | |
222 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
284 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -290,3 +352,83 b' merge them (from the chmod side)' | |||||
290 | $ [ -x z ] || echo "executable bit lost" |
|
352 | $ [ -x z ] || echo "executable bit lost" | |
291 |
|
353 | |||
292 | $ cd .. |
|
354 | $ cd .. | |
|
355 | ||||
|
356 | Removing the flag | |||
|
357 | ----------------- | |||
|
358 | ||||
|
359 | $ hg clone base-exec rename+mod-merge-repo-removal | |||
|
360 | updating to branch default | |||
|
361 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
362 | $ cd rename+mod-merge-repo-removal | |||
|
363 | ||||
|
364 | make "a" non-executable on one side | |||
|
365 | ||||
|
366 | $ chmod -x a | |||
|
367 | $ cat << EOF > a | |||
|
368 | > 1 | |||
|
369 | > x | |||
|
370 | > 3 | |||
|
371 | > 4 | |||
|
372 | > 5 | |||
|
373 | > 6 | |||
|
374 | > 7 | |||
|
375 | > 8 | |||
|
376 | > 9 | |||
|
377 | > EOF | |||
|
378 | $ hg status | |||
|
379 | M a | |||
|
380 | $ hg ci -m "make a non-executable, and change start" | |||
|
381 | $ [ -x z ] && echo "executable bit not removed" | |||
|
382 | [1] | |||
|
383 | $ hg up ".^" | |||
|
384 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
385 | ||||
|
386 | make "a" renamed on the other side | |||
|
387 | ||||
|
388 | $ hg mv a z | |||
|
389 | $ hg st --copies | |||
|
390 | A z | |||
|
391 | a | |||
|
392 | R a | |||
|
393 | $ cat << EOF > z | |||
|
394 | > 1 | |||
|
395 | > 2 | |||
|
396 | > 3 | |||
|
397 | > 4 | |||
|
398 | > 5 | |||
|
399 | > 6 | |||
|
400 | > 7 | |||
|
401 | > x | |||
|
402 | > 9 | |||
|
403 | > EOF | |||
|
404 | $ hg ci -m "rename a to z, and change end" | |||
|
405 | created new head | |||
|
406 | ||||
|
407 | merge them (from the rename side) | |||
|
408 | ||||
|
409 | $ hg merge 'desc("make a non-executable")' | |||
|
410 | merging z and a to z | |||
|
411 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |||
|
412 | (branch merge, don't forget to commit) | |||
|
413 | $ hg st --copies | |||
|
414 | M z | |||
|
415 | a | |||
|
416 | $ [ -x z ] && echo "executable bit not removed" | |||
|
417 | [1] | |||
|
418 | ||||
|
419 | merge them (from the chmod side) | |||
|
420 | ||||
|
421 | $ hg up -C 'desc("make a non-executable")' | |||
|
422 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
423 | $ hg merge 'desc("rename a to z")' | |||
|
424 | merging a and z to z | |||
|
425 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |||
|
426 | (branch merge, don't forget to commit) | |||
|
427 | $ hg st --copies | |||
|
428 | M z | |||
|
429 | a | |||
|
430 | R a | |||
|
431 | $ [ -x z ] && echo "executable bit not removed" | |||
|
432 | [1] | |||
|
433 | ||||
|
434 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now