Show More
@@ -65,7 +65,7 b' hg merge -r 2' | |||||
65 | override $PATH to ensure hgmerge not visible; use $PYTHON in case we're |
|
65 | override $PATH to ensure hgmerge not visible; use $PYTHON in case we're | |
66 | running from a devel copy, not a temp installation |
|
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 | merging f |
|
69 | merging f | |
70 | warning: conflicts during merge. |
|
70 | warning: conflicts during merge. | |
71 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
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 | $ echo "echo fail" > false |
|
112 | $ echo "echo fail" > false | |
113 | $ hg up -qC 1 |
|
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 | merging f |
|
115 | merging f | |
116 | warning: conflicts during merge. |
|
116 | warning: conflicts during merge. | |
117 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
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 | $ mkdir false |
|
127 | $ mkdir false | |
128 | $ hg up -qC 1 |
|
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 | merging f |
|
130 | merging f | |
131 | warning: conflicts during merge. |
|
131 | warning: conflicts during merge. | |
132 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
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