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

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

Stop patch description import at diff -r...
Stop patch description import at diff -r -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Stop patch description import at diff -r manifest hash: cc269f69c26ad4fba1fdaeefe2dc8191a0669fe0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyZmyywK+sNU5EO8RAkODAJ9d/JYpBOZiOcQxlz0n2VtIPtK/IgCgl2Lj caGbq4yn4RxzBQqqIoQzOTQ= =9fHy -----END PGP SIGNATURE-----
mpm@selenic.com - - Load All Authors

File last commit:

r430:5b22029b default
r614:6bff574d default
Show More
test-merge1.out
82 lines | 1.7 KiB | text/plain | TextLexer
/ tests / test-merge1.out
History | Source | Raw |Copy content |Copy permalink
mpm@selenic.com
[PATCH] Merging identical changes from another branch...
 r407 + 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
mpm@selenic.com
Fix up test-merge1...
 r430 + cat b
This is file b1
mpm@selenic.com
[PATCH] Merging identical changes from another branch...
 r407 + echo This is file b22
+ env HGMERGE=../merge hg update -m 2
mpm@selenic.com
Fix up test-merge1...
 r430 merging for b
merging b
mpm@selenic.com
[PATCH] Merging identical changes from another branch...
 r407 + 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