tests/test-merge3
author mpm@selenic.com
Tue, 28 Jun 2005 02:48:21 -0800
changeset 509 98a2935c3d6c
parent 402 2fe8d66e3075
child 749 7e4843b7efd2
permissions -rwxr-xr-x
[PATCH] replace history with log -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] replace history with log From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> Merge hg history into hg log leaving the first as an alias (tweaked by mpm: update docs, tests, use existing alias mechanism) manifest hash: f85001a4373b8b823a6221ba5c506628059d6779 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSr1ywK+sNU5EO8RAmbAAJ9HlFkf8/qLOAQUtj8CWxGRPEyzVgCgtXwP SdnAg1a2q4693+TBiOjrimY= =w9rf -----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
#!/bin/sh -x
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     2
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     3
hg init
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     4
echo This is file a1 > a
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     5
hg add a
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     6
hg commit -t "commit #0" -d "0 0" -u user
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     7
touch b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     8
hg add b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
     9
rm b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
    10
hg commit -A -t"comment #1" -d "0 0" -u user