Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-extdiff.out @ 5109:841568ccc09d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: made it less chatty in non-verbose mode Made the status info only display in verbose mode since most hg commands aren't so chatty. This also makes it cleaner for other extensions to call extdiff.
author Brad Schick <schickb@gmail.com>
date Mon, 06 Aug 2007 14:42:11 -0700
parents eadfaa9ec487
children 2be225ea5722
comparison
equal deleted inserted replaced
5108:1830bc7676ee 5109:841568ccc09d
1 adding a 1 adding a
2 making snapshot of 0 files from rev 000000000000
3 making snapshot of 1 files from working dir
4 Only in a: a 2 Only in a: a
5 making snapshot of 0 files from rev 000000000000
6 making snapshot of 1 files from working dir
7 diffing a.000000000000 a 3 diffing a.000000000000 a
8 hg falabala [OPTION]... [FILE]... 4 hg falabala [OPTION]... [FILE]...
9 5
10 use 'echo' to diff repository (or selected files) 6 use 'echo' to diff repository (or selected files)
11 7
24 -r --rev revision 20 -r --rev revision
25 -I --include include names matching the given patterns 21 -I --include include names matching the given patterns
26 -X --exclude exclude names matching the given patterns 22 -X --exclude exclude names matching the given patterns
27 23
28 use "hg -v help falabala" to show global options 24 use "hg -v help falabala" to show global options
29 making snapshot of 1 files from rev e27a2475d60a
30 making snapshot of 1 files from rev 5e49ec8d3f05
31 diffing a.e27a2475d60a a.5e49ec8d3f05 25 diffing a.e27a2475d60a a.5e49ec8d3f05
32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
33 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 27 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
34 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
35 (branch merge, don't forget to commit) 29 (branch merge, don't forget to commit)
36 making snapshot of 1 files from rev 5e49ec8d3f05
37 making snapshot of 1 files from working dir
38 diffing a.5e49ec8d3f05 a 30 diffing a.5e49ec8d3f05 a
39 diff-like tools yield a non-zero exit code 31 diff-like tools yield a non-zero exit code