Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge6.out @ 642:5d6177b72fcc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update tests
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Jul 2005 22:27:25 -0800
parents d45d1c90032e
children 32f7dc81c07e
comparison
equal deleted inserted replaced
641:27f53edc02b9 642:5d6177b72fcc
9 + echo This is file bar1 9 + echo This is file bar1
10 + hg add foo bar 10 + hg add foo bar
11 + hg commit -t 'commit text' -d '0 0' -u user 11 + hg commit -t 'commit text' -d '0 0' -u user
12 + cd .. 12 + cd ..
13 + hg clone A1 B1 13 + hg clone A1 B1
14 cloning by hardlink
14 + cd A1 15 + cd A1
15 + rm bar 16 + rm bar
16 + hg remove bar 17 + hg remove bar
17 + hg commit -t 'commit test' -d '0 0' -u user 18 + hg commit -t 'commit test' -d '0 0' -u user
18 + cd ../B1 19 + cd ../B1
19 + echo This is file foo22 20 + echo This is file foo22
20 + hg commit -t 'commit test' -d '0 0' -u user 21 + hg commit -t 'commit test' -d '0 0' -u user
21 + cd .. 22 + cd ..
22 + hg clone A1 A2 23 + hg clone A1 A2
24 cloning by hardlink
23 + hg clone B1 B2 25 + hg clone B1 B2
26 cloning by hardlink
24 + cd A1 27 + cd A1
25 + hg pull ../B1 28 + hg pull ../B1
26 pulling from ../B1 29 pulling from ../B1
27 searching for changes 30 searching for changes
28 adding changesets 31 adding changesets