Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge6.out @ 925:5a034646e472

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: remove '+ hg' trick This was causing me a fair amount of debugging confusion. Let's just forget it entirely. Updated tests to match.
author mpm@selenic.com
date Tue, 16 Aug 2005 19:03:01 -0800
parents 0902ffece4b4
children 5007e0bdeed2
comparison
equal deleted inserted replaced
924:ab681ea2857e 925:5a034646e472
1 + hg init
2 + hg add foo bar
3 + hg commit -m commit text -d 0 0
4 + hg clone A1 B1
5 + hg remove bar
6 + hg commit -m commit test -d 0 0
7 + hg commit -m commit test -d 0 0
8 + hg clone A1 A2
9 + hg clone B1 B2
10 + hg pull ../B1
11 pulling from ../B1 1 pulling from ../B1
12 searching for changes 2 searching for changes
13 adding changesets 3 adding changesets
14 adding manifests 4 adding manifests
15 adding file changes 5 adding file changes
16 added 1 changesets with 1 changes to 1 files 6 added 1 changesets with 1 changes to 1 files
17 (run 'hg update' to get a working copy) 7 (run 'hg update' to get a working copy)
18 + hg update -m
19 + hg commit -m commit test -d 0 0
20 bar should remain deleted. 8 bar should remain deleted.
21 + hg manifest
22 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo 9 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
23 + hg pull ../A2
24 pulling from ../A2 10 pulling from ../A2
25 searching for changes 11 searching for changes
26 adding changesets 12 adding changesets
27 adding manifests 13 adding manifests
28 adding file changes 14 adding file changes
29 added 1 changesets with 0 changes to 0 files 15 added 1 changesets with 0 changes to 0 files
30 (run 'hg update' to get a working copy) 16 (run 'hg update' to get a working copy)
31 + hg update -m
32 + hg commit -m commit test -d 0 0
33 bar should remain deleted. 17 bar should remain deleted.
34 + hg manifest
35 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo 18 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo