Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge6.out @ 676:32f7dc81c07e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove references to 'cloning by hardlink' from tests. # HG changeset patch # User Andrew Thompson <andrewkt@aktzero.com> # Node ID c12a49438454e9782ff7eb9b11841e7b9406fbab # Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d Remove references to 'cloning by hardlink' from tests.
author Andrew Thompson <andrewkt@aktzero.com>
date Sun, 10 Jul 2005 16:17:05 -0800
parents 5d6177b72fcc
children 7e4843b7efd2
comparison
equal deleted inserted replaced
675:49de76abc4da 676:32f7dc81c07e
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
15 + cd A1 14 + cd A1
16 + rm bar 15 + rm bar
17 + hg remove bar 16 + hg remove bar
18 + hg commit -t 'commit test' -d '0 0' -u user 17 + hg commit -t 'commit test' -d '0 0' -u user
19 + cd ../B1 18 + cd ../B1
20 + echo This is file foo22 19 + echo This is file foo22
21 + hg commit -t 'commit test' -d '0 0' -u user 20 + hg commit -t 'commit test' -d '0 0' -u user
22 + cd .. 21 + cd ..
23 + hg clone A1 A2 22 + hg clone A1 A2
24 cloning by hardlink
25 + hg clone B1 B2 23 + hg clone B1 B2
26 cloning by hardlink
27 + cd A1 24 + cd A1
28 + hg pull ../B1 25 + hg pull ../B1
29 pulling from ../B1 26 pulling from ../B1
30 searching for changes 27 searching for changes
31 adding changesets 28 adding changesets