Show More
@@ -47,6 +47,11 b' type "$KDIFF3" >/dev/null 2>&1 || KDI' | |||
|
47 | 47 | type "$TKDIFF" >/dev/null 2>&1 || TKDIFF= |
|
48 | 48 | type "$MELD" >/dev/null 2>&1 || MELD= |
|
49 | 49 | |
|
50 | # Hack for Solaris | |
|
51 | TEST="/usr/bin/test" | |
|
52 | type "$TEST" >/dev/null 2>&1 || TEST="/bin/test" | |
|
53 | type "$TEST" >/dev/null 2>&1 || TEST="test" | |
|
54 | ||
|
50 | 55 | # random part of names |
|
51 | 56 | RAND="$RANDOM$RANDOM" |
|
52 | 57 | |
@@ -118,7 +123,7 b' if [ -n "$FILEMERGE" ]; then' | |||
|
118 | 123 | # filemerge prefers the right by default |
|
119 | 124 | $FILEMERGE -left "$OTHER" -right "$LOCAL" -ancestor "$BASE" -merge "$LOCAL" |
|
120 | 125 | [ $? -ne 0 ] && echo "FileMerge failed to launch" && failure |
|
121 |
|
|
|
126 | $TEST "$LOCAL" -nt "$CHGTEST" && success || ask_if_merged | |
|
122 | 127 | fi |
|
123 | 128 | |
|
124 | 129 | if [ -n "$DISPLAY" ]; then |
@@ -142,7 +147,7 b' if [ -n "$DISPLAY" ]; then' | |||
|
142 | 147 | # use the file with conflicts |
|
143 | 148 | $MELD "$LOCAL.tmp.$RAND" "$LOCAL" "$OTHER" || failure |
|
144 | 149 | # Also it doesn't return good error code |
|
145 |
|
|
|
150 | $TEST "$LOCAL" -nt "$CHGTEST" && success || ask_if_merged | |
|
146 | 151 | fi |
|
147 | 152 | fi |
|
148 | 153 | |
@@ -153,7 +158,7 b' if [ -n "$MERGE" -o -n "$DIFF3" ]; then' | |||
|
153 | 158 | $EDITOR "$LOCAL" || failure |
|
154 | 159 | # Some editors do not return meaningful error codes |
|
155 | 160 | # Do not take any chances |
|
156 |
|
|
|
161 | $TEST "$LOCAL" -nt "$CHGTEST" && success || ask_if_merged | |
|
157 | 162 | fi |
|
158 | 163 | |
|
159 | 164 | # attempt to manually merge with diff and patch |
@@ -170,7 +175,7 b' if [ -n "$DIFF" -a -n "$PATCH" ]; then' | |||
|
170 | 175 | else |
|
171 | 176 | # If rejects are empty after using the editor, merge was ok |
|
172 | 177 | $EDITOR "$LOCAL" "$LOCAL.rej" || failure |
|
173 |
|
|
|
178 | $TEST -s "$LOCAL.rej" || success | |
|
174 | 179 | fi |
|
175 | 180 | failure |
|
176 | 181 | fi |
General Comments 0
You need to be logged in to leave comments.
Login now