Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-simple-update.out @ 808:8f5637f0a0c0
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 08:35:29 -0800 |
parents | 122449dd89db 1f9ec150a476 |
children | 0902ffece4b4 |
comparison
equal
deleted
inserted
replaced
788:64d2a558c943 | 808:8f5637f0a0c0 |
---|---|
1 + mkdir test | |
2 + cd test | |
3 + echo foo | |
4 + hg init | 1 + hg init |
5 + hg addremove | 2 + hg addremove |
6 adding foo | 3 adding foo |
7 + hg commit -m 1 | 4 + hg commit -m 1 |
8 + hg verify | 5 + hg verify |
10 checking manifests | 7 checking manifests |
11 crosschecking files in changesets and manifests | 8 crosschecking files in changesets and manifests |
12 checking files | 9 checking files |
13 1 files, 1 changesets, 1 total revisions | 10 1 files, 1 changesets, 1 total revisions |
14 + hg clone . ../branch | 11 + hg clone . ../branch |
15 + cd ../branch | |
16 + hg co | 12 + hg co |
17 + echo bar | |
18 + hg commit -m 2 | 13 + hg commit -m 2 |
19 + cd ../test | |
20 + hg pull ../branch | 14 + hg pull ../branch |
21 pulling from ../branch | 15 pulling from ../branch |
22 searching for changes | 16 searching for changes |
23 adding changesets | 17 adding changesets |
24 adding manifests | 18 adding manifests |
30 checking manifests | 24 checking manifests |
31 crosschecking files in changesets and manifests | 25 crosschecking files in changesets and manifests |
32 checking files | 26 checking files |
33 1 files, 2 changesets, 2 total revisions | 27 1 files, 2 changesets, 2 total revisions |
34 + hg co | 28 + hg co |
35 + cat foo | |
36 foo | 29 foo |
37 bar | 30 bar |
38 + hg manifest | 31 + hg manifest |
39 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo | 32 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo |