Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-flags.out @ 801:1f9ec150a476
Updated output of tests.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 15:21:02 +0100 |
parents | 445970ccf57a |
children | 8f5637f0a0c0 |
comparison
equal
deleted
inserted
replaced
800:ec85f9e6f3b1 | 801:1f9ec150a476 |
---|---|
1 + umask 027 | |
2 + mkdir test1 | |
3 + cd test1 | |
4 + hg init | 1 + hg init |
5 + touch a b | |
6 + hg add a b | 2 + hg add a b |
7 + hg ci -m 'added a b' -d '0 0' | 3 + hg ci -m added a b -d 0 0 |
8 + cd .. | |
9 + mkdir test2 | |
10 + cd test2 | |
11 + hg init | 4 + hg init |
12 + hg pull ../test1 | 5 + hg pull ../test1 |
13 pulling from ../test1 | 6 pulling from ../test1 |
14 requesting all changes | 7 requesting all changes |
15 adding changesets | 8 adding changesets |
16 adding manifests | 9 adding manifests |
17 adding file changes | 10 adding file changes |
18 added 1 changesets with 2 changes to 2 files | 11 added 1 changesets with 2 changes to 2 files |
19 (run 'hg update' to get a working copy) | 12 (run 'hg update' to get a working copy) |
20 + hg co | 13 + hg co |
21 + chmod +x a | 14 + hg ci -m chmod +x a -d 0 0 |
22 + hg ci -m 'chmod +x a' -d '0 0' | 15 + hg ci -m a updated -d 0 0 |
23 + cd ../test1 | |
24 + echo 123 | |
25 + hg ci -m 'a updated' -d '0 0' | |
26 + hg pull ../test2 | 16 + hg pull ../test2 |
27 pulling from ../test2 | 17 pulling from ../test2 |
28 searching for changes | 18 searching for changes |
29 adding changesets | 19 adding changesets |
30 adding manifests | 20 adding manifests |
64 | 54 |
65 + hg -v co -m | 55 + hg -v co -m |
66 resolving manifests | 56 resolving manifests |
67 merging a | 57 merging a |
68 resolving a | 58 resolving a |
69 + ls -l ../test1/a ../test2/a | |
70 + cut -b 0-10 | |
71 -rwxr-x--- | 59 -rwxr-x--- |
72 -rwxr-x--- | 60 -rwxr-x--- |