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

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

Fix typo in merging new files...
Fix typo in merging new files -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix typo in merging new files manifest hash: 4a6fee1e54c5c465a74f4d756a1ac549b15fdb2f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuOvVywK+sNU5EO8RArovAJ4ua9EhnO8wWfKRZ36E6F4Wrv5JPACghCXn sHr/TSkxdy48OUVkhTbhhhQ= =poww -----END PGP SIGNATURE-----
mpm@selenic.com - - Load All Authors

File last commit:

r409:feadc969 default
r428:183c87d4 default
Show More
test-merge2.out
47 lines | 916 B | text/plain | TextLexer
/ tests / test-merge2.out
History | Annotation | Raw |Copy content |Copy permalink
+ 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
+ rm b
+ hg update 0
+ echo This is file b2
+ hg add b
+ hg commit -t 'commit #2' -d '0 0' -u user
+ 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
+ rm b
+ hg update 0
+ echo This is file b2
+ hg commit -A -t 'commit #2' -d '0 0' -u user
+ 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
+ rm b
+ hg remove b
+ hg update 0
+ echo This is file b2
+ hg commit -A -t 'commit #2' -d '0 0' -u user
+ cd ..
+ /bin/rm -rf t