##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: treat `select` as a built-in module on Windows...
tests: treat `select` as a built-in module on Windows This fixes: --- C:/Users/Matt/hg/tests/test-check-module-imports.t +++ C:/Users/Matt/hg/tests/test-check-module-imports.t.err @@ -43,3 +43,15 @@ > -X tests/test-verify-repo-operations.py \ > -X tests/test-extension.t \ > | sed 's-\\-/-g' | "$PYTHON" "$import_checker" - + hgext/zeroconf/Zeroconf.py:86: stdlib import "socket" follows local import: select\r (esc) + hgext/zeroconf/Zeroconf.py:87: stdlib import "struct" follows local import: select\r (esc) + hgext/zeroconf/Zeroconf.py:88: stdlib import "threading" follows local import: select\r (esc) + hgext/zeroconf/Zeroconf.py:89: stdlib import "time" follows local import: select\r (esc) + hgext/zeroconf/Zeroconf.py:90: stdlib import "traceback" follows local import: select\r (esc) + mercurial/posix.py:18: stdlib import "stat" follows local import: select\r (esc) + mercurial/posix.py:19: stdlib import "sys" follows local import: select\r (esc) + mercurial/posix.py:20: stdlib import "tempfile" follows local import: select\r (esc) + mercurial/posix.py:21: stdlib import "typing" follows local import: select\r (esc) + tests/tinyproxy.py:19: stdlib import "socket" follows local import: select\r (esc) + tests/tinyproxy.py:20: stdlib import "sys" follows local import: select\r (esc) + [1] ERROR: test-check-module-imports.t output changed
Jean-Francois Pieronne - - Load All Authors

File last commit:

r51894:44001e6f default
r53080:3ba998d7 stable
Show More
hgmerge.com
76 lines | 2.2 KiB | application/x-msdownload | TextLexer
/ contrib / openvms / vms / hgmerge.com
History | Annotation | Raw |Copy content |Copy permalink
$!
$! Custom merge tool to help solve merge conflict in OpenVMS
$! We recommand to solve this on other system
$!
$ set proc/par=extend
$ mine = p1
$ orig = p2
$ theirs = p3
$ tovms :== $ MERCURIAL_ROOT:[vms]tovms
$ merged = p1 + ".hgmerge"
$ tovms 'merged'
$ merged = tmpfn
$
$ define DECC$UNIX_LEVEL 90
$ gdiff3 :== $ MERCURIAL_ROOT:[vms]gdiff3
$ gdiff == "$ MERCURIAL_ROOT:[VMS]gdiff"
$! gdiff -u 'orig' 'mine'
$! gdiff -u 'orig' 'theirs'
$ if (f$search("''merged'") .nes. "") then -
delete 'merged';*
$ define sys$output 'merged'
$ gdiff3 -"L" mine -"L" original -"L" theirs -"E" -m 'mine' 'orig' 'theirs'
$ status = $status
$ deassign sys$output
$ convert/fdl=mercurial_root:[vms]stmlf.fdl 'merged' 'merged'
$ purge/nolog 'merged'
$! No conflicts found. Merge done.
$ if status .eqs. "%X006C8009"
$ then
$ tovms 'p1'
$ mine = tmpfn
$ rename 'merged' 'mine'
$ purge/nolog 'mine'
$ write sys$output "Merged ''mine'"
$ exit 1
$ endif
$
$! In all other cases, diff3 has found conflicts, added the proper conflict
$! markers to the merged file and we should now edit this file. Fire up an
$! editor with the merged file and let the user manually resolve the conflicts.
$! When the editor exits successfully, there should be no conflict markers in
$! the merged file, otherwise we consider this merge failed.
$
$ if status .eqs. "%X006C8013"
$ then
$ deassign sys$input
$ edit 'merged'
$ open fi 'merged'
$ loop:
$ read fi srec/end=endloop
$ rec7 = f$extract(0, 7, srec)
$ if rec7 .eqs. "<<<<<<<" then goto conflict
$ if rec7 .eqs. "|||||||" then goto conflict
$ if rec7 .eqs. "=======" then goto conflict
$ if rec7 .eqs. ">>>>>>>" then goto conflict
$ goto loop
$ endloop:
$ close fi
$ tovms 'p1'
$ mine = tmpfn
$ rename 'merged' 'mine'
$ purge/nolog 'mine'
$ exit
$ endif
$ if (f$search("''merged'") .nes. "") then -
delete 'merged';*
$ write sys$output "serious diff3 error, while trying to merge ''mine'"
$ exit 44
$
$ conflict:
$ close fi
$ if (f$search("''merged'") .nes. "") then -
delete 'merged';*
$ write sys$output -
"conflict markers still found in the working-copy. Merge aborted for ''mine'"
$ exit 44