Submitter | phabricator |
---|---|
Date | Dec. 15, 2017, 10:53 p.m. |
Message ID | <differential-rev-PHID-DREV-2aexjrjrcx5v75wo4lk5-req@phab.mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/26324/ |
State | Superseded |
Headers | show |
Comments
krbullock accepted this revision. krbullock added a comment. This revision is now accepted and ready to land. LGTM, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1710 To: durin42, #hg-reviewers, krbullock Cc: krbullock, mercurial-devel
mharbison72 added a comment. It might be easier to use the `hg import --bypass` trick instead of making it symlink free, and have some testing around this corner case on Windows? (I haven't done anything with symlinks on Windows. I'm assuming it's just a flags thing, and should work.) FWIW, I haven't done anything on this because I suspect it has the same problems at test-pathconflicts-basic.t. These problems magically go away if -C is passed to update, but that's clearly not the intention. It's good to see the Windows tests closer to green. diff --git a/tests/test-pathconflicts-basic.t b/tests/test-pathconflicts-basic.t --- a/tests/test-pathconflicts-basic.t +++ b/tests/test-pathconflicts-basic.t @@ -29,7 +29,7 @@ Basic merge - local file conflicts with remote directory - $ hg up -q file + $ hg up -Cq file $ hg bookmark -i $ hg merge --verbose dir resolving manifests @@ -83,12 +83,12 @@ Basic clean update - local directory conflicts with changed remote file - $ hg up -q file + $ hg up -Cq file $ rm a $ mkdir a $ echo 4 > a/b $ hg up file2 - abort: *: '$TESTTMP/repo/a' (glob) + abort: Unlinking directory not permitted: '$TESTTMP\repo\a' [255] $ hg up --clean file2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1710 To: durin42, #hg-reviewers, krbullock Cc: mharbison72, krbullock, mercurial-devel
Patch
diff --git a/tests/test-pathconflicts-merge.t b/tests/test-pathconflicts-merge.t --- a/tests/test-pathconflicts-merge.t +++ b/tests/test-pathconflicts-merge.t @@ -1,3 +1,5 @@ +#require symlink + Path conflict checking is currently disabled by default because of issue5716. Turn it on for this test.