Mercurial > hg
annotate tests/test-simple-update.out @ 6292:dc2f360444a0
Merge
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 17 Mar 2008 08:04:09 -0700 |
parents | 8feb33c2d153 |
children | 0750f11152fe |
rev | line source |
---|---|
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
1 adding foo |
331 | 2 checking changesets |
3 checking manifests | |
4 crosschecking files in changesets and manifests | |
5 checking files | |
6 1 files, 1 changesets, 1 total revisions | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
8 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
404 | 9 pulling from ../branch |
331 | 10 searching for changes |
11 adding changesets | |
12 adding manifests | |
775 | 13 adding file changes |
14 added 1 changesets with 1 changes to 1 files | |
404 | 15 (run 'hg update' to get a working copy) |
331 | 16 checking changesets |
17 checking manifests | |
18 crosschecking files in changesets and manifests | |
19 checking files | |
20 1 files, 2 changesets, 2 total revisions | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
331 | 22 foo |
23 bar | |
5405
8feb33c2d153
Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents:
2955
diff
changeset
|
24 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo |