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

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

Use __inline instead of inline...
Use __inline instead of inline -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use __inline instead of inline This should let us compile bdiff.c on the other OS. manifest hash: c1233bb3c7fc060e49dbd2597c122d903797db9e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuu/WywK+sNU5EO8RAtqvAKC0d8Kv8He6xNCwmFnvKcff9BT4gACeLq7n 9JDFxYtWMrgjwlShfay1nL4= =GDFt -----END PGP SIGNATURE-----
mpm@selenic.com - - Load All Authors

File last commit:

r409:feadc969 default
r439:f81a011f 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