tests/test-merge4.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 22 Jul 2005 08:11:49 +0100
changeset 756 5d79dfa5e98f
parent 749 7e4843b7efd2
child 801 1f9ec150a476
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rw-r--r--
Added new code contributors, fixed Vincent's name, added hint on encoding.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
416
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
     1
+ hg init
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
     2
+ echo This is file a1
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
     3
+ hg add a
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 416
diff changeset
     4
+ hg commit -m 'commit #0' -d '0 0'
416
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
     5
+ echo This is file b1
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
     6
+ hg add b
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 416
diff changeset
     7
+ hg commit -m 'commit #1' -d '0 0'
416
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
     8
+ hg update 0
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
     9
+ echo This is file c1
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
    10
+ hg add c
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 416
diff changeset
    11
+ hg commit -m 'commit #2' -d '0 0'
416
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
    12
+ hg update -m 1
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
    13
+ rm b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
    14
+ echo This is file c22
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 416
diff changeset
    15
+ hg commit -m 'commit #3' -d '0 0'