Mercurial > hg

comparison tests/test-merge-tools.t @ 43738:558f7585afcb stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: don't put $BINDIR in $PATH for test-merge-tools.t We call $BINDIR/hg explicitly anyway, so don't need it in $PATH. This fixes failures when running the test --with-hg=/usr/bin/hg, where we pick up /usr/bin/false as merge tool when we expected not to find it.
author Julien Cristau <jcristau@debian.org>
date Fri, 29 Nov 2019 18:49:59 +0100
parents 4764e8436b2a
children 8caec25f5d8f
comparison
equal deleted inserted replaced
43737:371765e775a2 43738:558f7585afcb
70 70
71 hg merge -r 2 71 hg merge -r 2
72 override $PATH to ensure hgmerge not visible; use $PYTHON in case we're 72 override $PATH to ensure hgmerge not visible; use $PYTHON in case we're
73 running from a devel copy, not a temp installation 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 merging f 76 merging f
77 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') 77 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
78 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 78 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
79 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon 79 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
80 [1] 80 [1]
119 119
120 unexecutable file in $PATH shouldn't be found: 120 unexecutable file in $PATH shouldn't be found:
121 121
122 $ echo "echo fail" > false 122 $ echo "echo fail" > false
123 $ hg up -qC 1 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 merging f 125 merging f
126 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') 126 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
127 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 127 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
128 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon 128 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
129 [1] 129 [1]
133 133
134 executable directory in $PATH shouldn't be found: 134 executable directory in $PATH shouldn't be found:
135 135
136 $ mkdir false 136 $ mkdir false
137 $ hg up -qC 1 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 merging f 139 merging f
140 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') 140 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
141 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 141 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
142 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon 142 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
143 [1] 143 [1]