equal
deleted
inserted
replaced
66 |
66 |
67 hg merge -r 2 |
67 hg merge -r 2 |
68 override $PATH to ensure hgmerge not visible; use $PYTHON in case we're |
68 override $PATH to ensure hgmerge not visible; use $PYTHON in case we're |
69 running from a devel copy, not a temp installation |
69 running from a devel copy, not a temp installation |
70 |
70 |
71 $ PATH="$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 |
71 $ PATH="$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2 |
72 merging f |
72 merging f |
73 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
73 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
74 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
74 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
75 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
75 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
76 [1] |
76 [1] |
115 |
115 |
116 unexecutable file in $PATH shouldn't be found: |
116 unexecutable file in $PATH shouldn't be found: |
117 |
117 |
118 $ echo "echo fail" > false |
118 $ echo "echo fail" > false |
119 $ hg up -qC 1 |
119 $ hg up -qC 1 |
120 $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 |
120 $ PATH="`pwd`:$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2 |
121 merging f |
121 merging f |
122 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
122 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
123 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
123 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
124 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
124 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
125 [1] |
125 [1] |
129 |
129 |
130 executable directory in $PATH shouldn't be found: |
130 executable directory in $PATH shouldn't be found: |
131 |
131 |
132 $ mkdir false |
132 $ mkdir false |
133 $ hg up -qC 1 |
133 $ hg up -qC 1 |
134 $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 |
134 $ PATH="`pwd`:$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2 |
135 merging f |
135 merging f |
136 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
136 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
137 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
137 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
138 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
138 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
139 [1] |
139 [1] |