test-merge6.out
35 lines
| 868 B
| text/plain
|
TextLexer
/ tests / test-merge6.out
maf46@burn.cl.cam.ac.uk
|
r616 | + hg init | ||
| + hg add foo bar | ||||
Thomas Arendsen Hein
|
r801 | + hg commit -m commit text -d 0 0 | ||
|
maf46@burn.cl.cam.ac.uk
|
r616 | + hg clone A1 B1 | ||
| + hg remove bar | ||||
|
Thomas Arendsen Hein
|
r801 | + hg commit -m commit test -d 0 0 | ||
| + hg commit -m commit test -d 0 0 | ||||
|
maf46@burn.cl.cam.ac.uk
|
r616 | + hg clone A1 A2 | ||
| + hg clone B1 B2 | ||||
| + hg pull ../B1 | ||||
| pulling from ../B1 | ||||
| searching for changes | ||||
| adding changesets | ||||
| adding manifests | ||||
mpm@selenic.com
|
r775 | adding file changes | ||
| added 1 changesets with 1 changes to 1 files | ||||
|
maf46@burn.cl.cam.ac.uk
|
r616 | (run 'hg update' to get a working copy) | ||
| + hg update -m | ||||
|
Thomas Arendsen Hein
|
r801 | + hg commit -m commit test -d 0 0 | ||
|
maf46@burn.cl.cam.ac.uk
|
r616 | bar should remain deleted. | ||
| + hg manifest | ||||
| 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo | ||||
| + hg pull ../A2 | ||||
| pulling from ../A2 | ||||
| searching for changes | ||||
| adding changesets | ||||
| adding manifests | ||||
|
mpm@selenic.com
|
r775 | adding file changes | ||
| added 1 changesets with 0 changes to 0 files | ||||
|
maf46@burn.cl.cam.ac.uk
|
r616 | (run 'hg update' to get a working copy) | ||
| + hg update -m | ||||
|
Thomas Arendsen Hein
|
r801 | + hg commit -m commit test -d 0 0 | ||
|
maf46@burn.cl.cam.ac.uk
|
r616 | bar should remain deleted. | ||
| + hg manifest | ||||
| 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo | ||||