Patchwork test-pathconflicts-merge: stop requiring symlink support

login
register
mail settings
Submitter Matt Harbison
Date March 25, 2018, 2:16 a.m.
Message ID <a8a0cafcef7950055e6b.1521944217@Envy>
Download mbox | patch
Permalink /patch/29830/
State Accepted
Headers show

Comments

Matt Harbison - March 25, 2018, 2:16 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1521943858 14400
#      Sat Mar 24 22:10:58 2018 -0400
# Node ID a8a0cafcef7950055e6b321a315e6f53e506fcd6
# Parent  704932ef8913f9a4d0aaeca0ef1bdb1bda0ad87e
test-pathconflicts-merge: stop requiring symlink support

The errors from the last time I took a shot at this back in early November have
disappeared, so let's just enable this.
Yuya Nishihara - March 25, 2018, 5:15 a.m.
On Sat, 24 Mar 2018 22:16:57 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1521943858 14400
> #      Sat Mar 24 22:10:58 2018 -0400
> # Node ID a8a0cafcef7950055e6b321a315e6f53e506fcd6
> # Parent  704932ef8913f9a4d0aaeca0ef1bdb1bda0ad87e
> test-pathconflicts-merge: stop requiring symlink support

Nice. Queued, thanks.

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,5 +1,3 @@ 
-#require symlink
-
 Path conflict checking is currently disabled by default because of issue5716.
 Turn it on for this test.
 
@@ -24,11 +22,29 @@  Turn it on for this test.
   $ hg bookmark -i file2
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+
+#if symlink
   $ mkdir a
   $ ln -s c a/b
   $ hg add a/b
   $ hg commit -m "link"
   created new head
+#else
+  $ hg import -q --bypass - <<EOF
+  > # HG changeset patch
+  > link
+  > 
+  > diff --git a/a/b b/a/b
+  > new file mode 120000
+  > --- /dev/null
+  > +++ b/a/b
+  > @@ -0,0 +1,1 @@
+  > +c
+  > \ No newline at end of file
+  > EOF
+  $ hg up -q
+#endif
+
   $ hg bookmark -i link
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -131,8 +147,15 @@  Merge - local directory conflicts with r
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
   $ hg mv a/b~2ea68033e3be a/b.old
+
+#if symlink
   $ readlink.py a/b.old
   a/b.old -> c
+#else
+  $ cat a/b.old
+  c (no-eol)
+#endif
+
   $ hg resolve --mark a/b
   (no more unresolved files)
   $ hg commit -m "merge link (rename link)"