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

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

test: don't put $BINDIR in $PATH for test-merge-tools.t...
Julien Cristau -
r44171:558f7585 stable
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -72,7 +72,7 b' hg merge -r 2'
72 72 override $PATH to ensure hgmerge not visible; use $PYTHON in case we're
73 73 running from a devel copy, not a temp installation
74 74
75 $ PATH="$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2
75 $ PATH="/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2
76 76 merging f
77 77 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
78 78 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -121,7 +121,7 b" unexecutable file in $PATH shouldn't be "
121 121
122 122 $ echo "echo fail" > false
123 123 $ hg up -qC 1
124 $ PATH="`pwd`:$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2
124 $ PATH="`pwd`:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2
125 125 merging f
126 126 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
127 127 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -135,7 +135,7 b" executable directory in $PATH shouldn't "
135 135
136 136 $ mkdir false
137 137 $ hg up -qC 1
138 $ PATH="`pwd`:$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2
138 $ PATH="`pwd`:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2
139 139 merging f
140 140 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
141 141 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
General Comments 0
You need to be logged in to leave comments. Login now