equal
deleted
inserted
replaced
63 |
63 |
64 hg merge -r 2 |
64 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') |
72 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
72 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
73 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
73 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
109 |
109 |
110 unexecutable file in $PATH shouldn't be found: |
110 unexecutable file in $PATH shouldn't be found: |
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') |
118 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
118 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
119 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
119 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
124 |
124 |
125 executable directory in $PATH shouldn't be found: |
125 executable directory in $PATH shouldn't be found: |
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') |
133 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
133 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
134 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
134 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |