Mercurial > hg > pyhgsh

annotate tests/test-simple-update.out @ 2398:2d5745fd03fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 04 Jun 2006 10:30:46 -0700
parents 4e35843b2683
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2182
4e35843b2683 Corrected test output for deprecated addremove command.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2175
diff changeset
1 (the addremove command is deprecated; use add and remove --after instead)
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
2 adding foo
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
3 checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
4 checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
5 crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
6 checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
7 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
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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
25 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo