Show More
@@ -754,8 +754,7 b' def _xmerge(repo, mynode, local, other, ' | |||
|
754 | 754 | # Remove the .orig to make syntax-highlighting more likely. |
|
755 | 755 | if localoutputpath.endswith(b'.orig'): |
|
756 | 756 | localoutputpath, ext = os.path.splitext(localoutputpath) |
|
757 | localdata = util.readfile(localpath) | |
|
758 | files.append((b"local", localoutputpath, localdata)) | |
|
757 | files.append((b"local", localoutputpath, backup.data())) | |
|
759 | 758 | |
|
760 | 759 | with _maketempfiles(files) as temppaths: |
|
761 | 760 | basepath, otherpath = temppaths[:2] |
@@ -316,8 +316,8 b' getbundle requests with stream=1 are unc' | |||
|
316 | 316 | #endif |
|
317 | 317 | #if zstd no-rust |
|
318 | 318 | $ f --size --hex --bytes 256 body |
|
319 | body: size=116310 | |
|
320 |
body: size=1163 |
|
|
319 | body: size=116310 (no-bigendian !) | |
|
320 | body: size=116305 (bigendian !) | |
|
321 | 321 | 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......| |
|
322 | 322 | 0010: 7c 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 ||.STREAM2.......| |
|
323 | 323 | 0020: 06 09 04 0c 40 62 79 74 65 63 6f 75 6e 74 31 30 |....@bytecount10| |
@@ -1213,6 +1213,42 b' premerge=keep keeps conflict markers in:' | |||
|
1213 | 1213 | # hg resolve --list |
|
1214 | 1214 | R f |
|
1215 | 1215 | |
|
1216 | with premerge=keep and $output in tool args, $local does not have markers: | |
|
1217 | ||
|
1218 | $ beforemerge | |
|
1219 | [merge-tools] | |
|
1220 | false.whatever= | |
|
1221 | true.priority=1 | |
|
1222 | true.executable=cat | |
|
1223 | # hg update -C 1 | |
|
1224 | $ hg merge -r 4 --config merge-tools.true.premerge=keep --config 'merge-tools.true.args=$base $local $other $output' | |
|
1225 | merging f | |
|
1226 | revision 0 | |
|
1227 | space | |
|
1228 | revision 1 | |
|
1229 | space | |
|
1230 | revision 4 | |
|
1231 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
|
1232 | revision 1 | |
|
1233 | space | |
|
1234 | ======= | |
|
1235 | revision 4 | |
|
1236 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 | |
|
1237 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
|
1238 | (branch merge, don't forget to commit) | |
|
1239 | $ aftermerge | |
|
1240 | # cat f | |
|
1241 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
|
1242 | revision 1 | |
|
1243 | space | |
|
1244 | ======= | |
|
1245 | revision 4 | |
|
1246 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 | |
|
1247 | # hg stat | |
|
1248 | M f | |
|
1249 | # hg resolve --list | |
|
1250 | R f | |
|
1251 | ||
|
1216 | 1252 | premerge=keep-merge3 keeps conflict markers with base content: |
|
1217 | 1253 | |
|
1218 | 1254 | $ beforemerge |
General Comments 0
You need to be logged in to leave comments.
Login now