Mercurial > hg

annotate tests/test-simple-update.out @ 7847:30cb79d84352

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: keep .orig files
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Mar 2009 16:58:41 -0500
parents 0750f11152fe
children a3d73b3e1f8a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
2 checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
3 checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
4 crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
5 checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
6 1 files, 1 changesets, 1 total revisions
6338
0750f11152fe clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents: 5405
diff changeset
7 updating working directory
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
8 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
9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset
10 pulling from ../branch
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
11 searching for changes
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
12 adding changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
13 adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
14 adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
15 added 1 changesets with 1 changes to 1 files
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset
16 (run 'hg update' to get a working copy)
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
17 checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
18 checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
19 crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
20 checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
21 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
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
23 foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
24 bar
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 2955
diff changeset
25 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo