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

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

extensions: use stdint.h...
extensions: use stdint.h -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 extensions: use stdint.h Not sure why I didn't do this the first time around. Hopefully still builds everywhere. manifest hash: 965582286a190728f8cc0dfb8e11ee56628a59a5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvfRgywK+sNU5EO8RAg9SAJ4/ZVpQZcDY5xovLDTZK2txEegEgwCdF2b+ lzSIP109qq8D+KIdUWsbEPc= =+0Yy -----END PGP SIGNATURE-----
mpm@selenic.com - - Load All Authors

File last commit:

r430:5b22029b default
r472:aa3d592d default
Show More
test-merge1.out
82 lines | 1.7 KiB | text/plain | TextLexer
/ tests / test-merge1.out
History | Annotation | Raw |Copy content |Copy permalink
+ cat
+ chmod +x merge
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -t 'commit #2' -d '0 0' -u user
+ echo This is file b1
+ env HGMERGE=../merge hg update -m 1
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -t 'commit #2' -d '0 0' -u user
+ echo This is file b2
+ env HGMERGE=../merge hg update -m 1
merging for b
merging b
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ echo This is file b22
+ hg commit -t 'commit #2' -d '0 0' -u user
+ hg update 1
+ echo This is file c1
+ hg add c
+ hg commit -t 'commit #3' -d '0 0' -u user
+ cat b
This is file b1
+ echo This is file b22
+ env HGMERGE=../merge hg update -m 2
merging for b
merging b
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ echo This is file b22
+ hg commit -t 'commit #2' -d '0 0' -u user
+ hg update 1
+ echo This is file c1
+ hg add c
+ hg commit -t 'commit #3' -d '0 0' -u user
+ echo This is file b33
+ env HGMERGE=../merge hg update -m 2
merging for b
merging b
+ cd ..
+ /bin/rm -rf t