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

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

Make tests work on Solaris:...
Make tests work on Solaris: - replacement for mktemp - fall back if shell arithmetic doesn't work - replacement for 'set -x' (which results look different with some shells) - "FOO=bar; export FOO" instead of "export FOO=bar" - don't use 'if ! ...'
Bryan O'Sullivan - - Load All Authors

File last commit:

r767:61ed30e8 default
r798:c28f9feb default
Show More
test-merge5.out
20 lines | 422 B | text/plain | TextLexer
/ tests / test-merge5.out
History | Annotation | Raw |Copy content |Copy permalink
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ echo This is file b1
+ hg add a b
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b22
+ hg commit '-mcomment #1' -d '0 0'
+ hg update 0
+ rm b
+ hg commit -A '-mcomment #2' -d '0 0'
removing b
+ yes k
+ hg update 1
this update spans a branch affecting the following files:
b
aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0