annotate tests/test-pull.out @ 2901:05f357b70cb0

Tune a bit the extdiff toplevel comments/samples. * Capitalize the first letter of all sentences * Add an example for GNU diff(1) 'context diff' mode. * Explain the requirement for separate cmd.xxx and opts.xxx options in .hgrc, which hopefully will guard against users trying to add: [extdiff] # Add a new Mercurial command called `cdiff', which calls # GNU diff(1) in 'context diff' mode. cmd.cdiff = diff -Nprc5 which fails for recent crew builds with: $ hg cdiff . making snapshot of 1 files from rev 07dc4a569f4e making snapshot of 1 files from working dir diff -Nprc5: not found The correct way to do this is by separating the cmd.cdiff and opts.cdiff parts like this: [extdiff] # Add a new Mercurial command called `cdiff', which calls # GNU diff(1) in 'context diff' mode. cmd.cdiff = diff opts.cdiff = -Nprc5 so add it as a new example and explicitly describe it in the extdiff comments.
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Tue, 15 Aug 2006 18:14:58 +0300
parents 4e35843b2683
children 9d1c3529ebbc
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: 642
diff changeset
2 adding foo
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
3 checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
4 checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
5 crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
6 checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
7 1 files, 1 changesets, 1 total revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
8 requesting all changes
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
9 adding changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
10 adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
11 adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
12 added 1 changesets with 1 changes to 1 files
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
14 checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
15 checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
16 crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
17 checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
18 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
19 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
20 foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
21 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
522
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset
22 pulling from http://localhost:20059/
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset
23 searching for changes
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset
24 no changes found