author | mason@suse.com |
Sun, 14 Aug 2005 20:08:35 -0800 | |
changeset 900 | ba8cf1f2210c |
parent 814 | 0902ffece4b4 |
child 925 | 5a034646e472 |
permissions | -rw-r--r-- |
616 | 1 |
+ hg init |
2 |
+ hg add foo bar |
|
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
793
diff
changeset
|
3 |
+ hg commit -m commit text -d 0 0 |
616 | 4 |
+ hg clone A1 B1 |
5 |
+ hg remove bar |
|
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
793
diff
changeset
|
6 |
+ hg commit -m commit test -d 0 0 |
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
793
diff
changeset
|
7 |
+ hg commit -m commit test -d 0 0 |
616 | 8 |
+ hg clone A1 A2 |
9 |
+ hg clone B1 B2 |
|
10 |
+ hg pull ../B1 |
|
11 |
pulling from ../B1 |
|
12 |
searching for changes |
|
13 |
adding changesets |
|
14 |
adding manifests |
|
775 | 15 |
adding file changes |
16 |
added 1 changesets with 1 changes to 1 files |
|
616 | 17 |
(run 'hg update' to get a working copy) |
18 |
+ hg update -m |
|
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
793
diff
changeset
|
19 |
+ hg commit -m commit test -d 0 0 |
616 | 20 |
bar should remain deleted. |
21 |
+ hg manifest |
|
22 |
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |
|
23 |
+ hg pull ../A2 |
|
24 |
pulling from ../A2 |
|
25 |
searching for changes |
|
26 |
adding changesets |
|
27 |
adding manifests |
|
775 | 28 |
adding file changes |
29 |
added 1 changesets with 0 changes to 0 files |
|
616 | 30 |
(run 'hg update' to get a working copy) |
31 |
+ hg update -m |
|
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
793
diff
changeset
|
32 |
+ hg commit -m commit test -d 0 0 |
616 | 33 |
bar should remain deleted. |
34 |
+ hg manifest |
|
35 |
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |