##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

test-merge-tools: include /usr/sbin in path for sysctl (issue4813)...
timeless@mozdev.org -
r26168:b907051d default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -65,7 +65,7 b' hg merge -r 2'
65 65 override $PATH to ensure hgmerge not visible; use $PYTHON in case we're
66 66 running from a devel copy, not a temp installation
67 67
68 $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
68 $ PATH="$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
69 69 merging f
70 70 warning: conflicts during merge.
71 71 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
@@ -111,7 +111,7 b" unexecutable file in $PATH shouldn't be "
111 111
112 112 $ echo "echo fail" > false
113 113 $ hg up -qC 1
114 $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
114 $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
115 115 merging f
116 116 warning: conflicts during merge.
117 117 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
@@ -126,7 +126,7 b" executable directory in $PATH shouldn't "
126 126
127 127 $ mkdir false
128 128 $ hg up -qC 1
129 $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
129 $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
130 130 merging f
131 131 warning: conflicts during merge.
132 132 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
General Comments 0
You need to be logged in to leave comments. Login now