##// END OF EJS Templates
merge: disable path conflict checking by default (issue5716)...
Siddharth Agarwal -
r34943:2a774cae stable
parent child Browse files
Show More
@@ -579,7 +579,7 b" coreconfigitem('merge', 'checkignored',"
579 579 default='abort',
580 580 )
581 581 coreconfigitem('experimental', 'merge.checkpathconflicts',
582 default=True,
582 default=False,
583 583 )
584 584 coreconfigitem('merge', 'followcopies',
585 585 default=True,
@@ -104,8 +104,7 b' attack back/test where back symlinks to '
104 104 back/test
105 105 #if symlink
106 106 $ hg update -Cr2
107 back: is both a file and a directory
108 abort: destination manifest contains path conflicts
107 abort: path 'back/test' traverses symbolic link 'back'
109 108 [255]
110 109 #else
111 110 ('back' will be a file and cause some other system specific error)
@@ -167,12 +166,8 b' try trivial merge'
167 166
168 167 $ hg up -qC 1
169 168 $ hg merge 2
170 a: path conflict - a file or link has the same name as a directory
171 the local file has been renamed to a~aa04623eb0c3
172 resolve manually then use 'hg resolve --mark a'
173 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
174 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
175 [1]
169 abort: path 'a/poisoned' traverses symbolic link 'a'
170 [255]
176 171
177 172 try rebase onto other revision: cache of audited paths should be discarded,
178 173 and the rebase should fail (issue5628)
@@ -180,11 +175,8 b' and the rebase should fail (issue5628)'
180 175 $ hg up -qC 2
181 176 $ hg rebase -s 2 -d 1 --config extensions.rebase=
182 177 rebasing 2:e73c21d6b244 "file a/poisoned" (tip)
183 a: path conflict - a file or link has the same name as a directory
184 the local file has been renamed to a~aa04623eb0c3
185 resolve manually then use 'hg resolve --mark a'
186 unresolved conflicts (see hg resolve, then hg rebase --continue)
187 [1]
178 abort: path 'a/poisoned' traverses symbolic link 'a'
179 [255]
188 180 $ ls ../merge-symlink-out
189 181
190 182 $ cd ..
@@ -216,8 +208,7 b' try linear update where symlink already '
216 208
217 209 $ hg up -qC 0
218 210 $ hg up 1
219 a: is both a file and a directory
220 abort: destination manifest contains path conflicts
211 abort: path 'a/b' traverses symbolic link 'a'
221 212 [255]
222 213
223 214 try linear update including symlinked directory and its content: paths are
@@ -226,8 +217,7 b' audited first by calculateupdates(), whe'
226 217
227 218 $ hg up -qC null
228 219 $ hg up 1
229 a: is both a file and a directory
230 abort: destination manifest contains path conflicts
220 abort: path 'a/b' traverses symbolic link 'a'
231 221 [255]
232 222 $ ls ../update-symlink-out
233 223
@@ -238,8 +228,7 b' a symlink.'
238 228 $ rm -f a
239 229 $ hg up -qC 2
240 230 $ hg up 1
241 a: is both a file and a directory
242 abort: destination manifest contains path conflicts
231 abort: path 'a/b' traverses symbolic link 'a'
243 232 [255]
244 233 $ ls ../update-symlink-out
245 234
@@ -975,12 +975,8 b' and the merge should fail (issue5628)'
975 975 *** runcommand up -qC 2
976 976 *** runcommand up -qC 1
977 977 *** runcommand merge 2
978 a: path conflict - a file or link has the same name as a directory
979 the local file has been renamed to a~aa04623eb0c3
980 resolve manually then use 'hg resolve --mark a'
981 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
982 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
983 [1]
978 abort: path 'a/poisoned' traverses symbolic link 'a'
979 [255]
984 980 $ ls ../merge-symlink-out
985 981
986 982 cache of repo.auditor should be discarded, so matcher would never traverse
@@ -30,22 +30,23 b" of the files in a commit we're updating "
30 30
31 31 $ mkdir b && touch b/nonempty
32 32 $ hg up
33 b: untracked directory conflicts with file
34 abort: untracked files in working directory differ from files in requested revision
35 [255]
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
36 34 $ hg ci
37 35 nothing changed
38 36 [1]
39 37 $ hg sum
40 parent: 0:538afb845929
41 commit #0
38 parent: 1:b8bb4a988f25 tip
39 commit #1
42 40 branch: default
43 commit: 1 unknown (clean)
44 update: 1 new changesets (update)
41 commit: (clean)
42 update: (current)
45 43 phases: 2 draft
46 $ rm b/nonempty
44
45 The following line is commented out because the file doesn't exist at the moment, and some OSes error out even with `rm -f`.
46 $ rm b/nonempty
47
47 48 $ hg up
48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
49 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
49 50 $ hg sum
50 51 parent: 1:b8bb4a988f25 tip
51 52 commit #1
@@ -1,3 +1,11 b''
1 Path conflict checking is currently disabled by default because of issue5716.
2 Turn it on for this test.
3
4 $ cat >> $HGRCPATH << EOF
5 > [experimental]
6 > merge.checkpathconflicts=True
7 > EOF
8
1 9 $ hg init repo
2 10 $ cd repo
3 11 $ echo base > base
@@ -96,4 +104,3 b' Repo state is ok'
96 104 commit: (clean)
97 105 update: 1 new changesets, 2 branch heads (merge)
98 106 phases: 4 draft
99
@@ -1,3 +1,11 b''
1 Path conflict checking is currently disabled by default because of issue5716.
2 Turn it on for this test.
3
4 $ cat >> $HGRCPATH << EOF
5 > [experimental]
6 > merge.checkpathconflicts=True
7 > EOF
8
1 9 $ hg init repo
2 10 $ cd repo
3 11 $ echo base > base
@@ -1,3 +1,11 b''
1 Path conflict checking is currently disabled by default because of issue5716.
2 Turn it on for this test.
3
4 $ cat >> $HGRCPATH << EOF
5 > [experimental]
6 > merge.checkpathconflicts=True
7 > EOF
8
1 9 $ hg init repo
2 10 $ cd repo
3 11 $ echo base > base
@@ -150,4 +158,3 b' Update clean - local directory conflicts'
150 158 $ hg up file2 --clean
151 159 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
152 160 (activating bookmark file2)
153
@@ -50,9 +50,7 b' make sure that this does not erase untra'
50 50 $ hg st
51 51 ? name/file
52 52 $ hg up 1
53 name: untracked directory conflicts with file
54 abort: untracked files in working directory differ from files in requested revision
55 [255]
53 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
56 54 $ cd ..
57 55
58 56 #if symlink
General Comments 0
You need to be logged in to leave comments. Login now