tests/test-merge3.out
author mpm@selenic.com
Tue, 28 Jun 2005 10:42:02 -0800
changeset 511 9f67222186bd
parent 402 2fe8d66e3075
child 749 7e4843b7efd2
permissions -rw-r--r--
Disallow merging of unrelated projects -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Disallow merging of unrelated projects manifest hash: 40badbca64e1ccfd83fee8cd7bf5099f57b6f8bf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZn6ywK+sNU5EO8RAmdeAJ9TAaGSe0nGMdL+Du3AGwm9x28IUgCgpfGG UunOBkobMVLGdHegnOvQkmQ= =VwVi -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     1
+ hg init
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     2
+ echo This is file a1
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     3
+ hg add a
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     4
+ hg commit -t 'commit #0' -d '0 0' -u user
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     5
+ touch b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     6
+ hg add b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     7
+ rm b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     8
+ hg commit -A '-tcomment #1' -d '0 0' -u user
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     9
b never committed!