Mercurial > hg
annotate tests/test-pathconflicts-merge.t @ 34569:e304fd82c718
tests: use readlink.py instead of readlink
The latter doesn't always exist, such as on Solaris-derived platforms.
Differential Revision: https://phab.mercurial-scm.org/D996
author | Augie Fackler <augie@google.com> |
---|---|
date | Tue, 10 Oct 2017 11:02:23 -0400 |
parents | f71c712ebdec |
children | 75bd034a1e00 |
rev | line source |
---|---|
34558
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
1 $ hg init repo |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
2 $ cd repo |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
3 $ echo base > base |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
4 $ hg add base |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
5 $ hg commit -m "base" |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
6 $ hg bookmark -i base |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
7 $ mkdir a |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
8 $ echo 1 > a/b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
9 $ hg add a/b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
10 $ hg commit -m "file" |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
11 $ hg bookmark -i file |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
12 $ echo 2 > a/b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
13 $ hg commit -m "file2" |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
14 $ hg bookmark -i file2 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
15 $ hg up 0 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
16 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
17 $ mkdir a |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
18 $ ln -s c a/b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
19 $ hg add a/b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
20 $ hg commit -m "link" |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
21 created new head |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
22 $ hg bookmark -i link |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
23 $ hg up 0 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
24 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
25 $ mkdir -p a/b/c |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
26 $ echo 2 > a/b/c/d |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
27 $ hg add a/b/c/d |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
28 $ hg commit -m "dir" |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
29 created new head |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
30 $ hg bookmark -i dir |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
31 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
32 Merge - local file conflicts with remote directory |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
33 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
34 $ hg up file |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
35 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
36 (activating bookmark file) |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
37 $ hg bookmark -i |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
38 $ hg merge --verbose dir |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
39 resolving manifests |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
40 a/b: path conflict - a file or link has the same name as a directory |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
41 the local file has been renamed to a/b~0ed027b96f31 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
42 resolve manually then use 'hg resolve --mark a/b' |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
43 moving a/b to a/b~0ed027b96f31 (glob) |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
44 getting a/b/c/d |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
45 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
46 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
47 [1] |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
48 $ hg status |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
49 M a/b/c/d |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
50 A a/b~0ed027b96f31 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
51 R a/b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
52 $ hg resolve --all |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
53 a/b: path conflict must be resolved manually |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
54 $ hg forget a/b~0ed027b96f31 && rm a/b~0ed027b96f31 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
55 $ hg resolve --mark a/b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
56 (no more unresolved files) |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
57 $ hg commit -m "merge file and dir (deleted file)" |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
58 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
59 Merge - local symlink conflicts with remote directory |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
60 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
61 $ hg up link |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
62 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
63 (activating bookmark link) |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
64 $ hg bookmark -i |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
65 $ hg merge dir |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
66 a/b: path conflict - a file or link has the same name as a directory |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
67 the local file has been renamed to a/b~2ea68033e3be |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
68 resolve manually then use 'hg resolve --mark a/b' |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
69 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
70 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
71 [1] |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
72 $ hg status |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
73 M a/b/c/d |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
74 A a/b~2ea68033e3be |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
75 R a/b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
76 $ hg resolve --list |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
77 P a/b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
78 $ hg resolve --all |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
79 a/b: path conflict must be resolved manually |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
80 $ hg mv a/b~2ea68033e3be a/b.old |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
81 $ hg resolve --mark a/b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
82 (no more unresolved files) |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
83 $ hg resolve --list |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
84 R a/b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
85 $ hg commit -m "merge link and dir (renamed link)" |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
86 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
87 Merge - local directory conflicts with remote file or link |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
88 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
89 $ hg up dir |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
90 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
91 (activating bookmark dir) |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
92 $ hg bookmark -i |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
93 $ hg merge file |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
94 a/b: path conflict - a file or link has the same name as a directory |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
95 the remote file has been renamed to a/b~0ed027b96f31 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
96 resolve manually then use 'hg resolve --mark a/b' |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
97 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
98 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
99 [1] |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
100 $ hg status |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
101 A a/b~0ed027b96f31 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
102 $ hg resolve --all |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
103 a/b: path conflict must be resolved manually |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
104 $ hg mv a/b~0ed027b96f31 a/b/old-b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
105 $ hg resolve --mark a/b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
106 (no more unresolved files) |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
107 $ hg commit -m "merge dir and file (move file into dir)" |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
108 created new head |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
109 $ hg merge file2 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
110 merging a/b/old-b and a/b to a/b/old-b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
111 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
112 (branch merge, don't forget to commit) |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
113 $ cat a/b/old-b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
114 2 |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
115 $ hg commit -m "merge file2 (copytrace tracked rename)" |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
116 $ hg merge link |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
117 a/b: path conflict - a file or link has the same name as a directory |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
118 the remote file has been renamed to a/b~2ea68033e3be |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
119 resolve manually then use 'hg resolve --mark a/b' |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
120 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
121 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
122 [1] |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
123 $ hg mv a/b~2ea68033e3be a/b.old |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
124 $ readlink a/b.old |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
125 c |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
126 $ hg resolve --mark a/b |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
127 (no more unresolved files) |
f71c712ebdec
tests: add test for path conflicts during merge
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
128 $ hg commit -m "merge link (rename link)" |