##// END OF EJS Templates
Fixed test-extdiff....
Thomas Arendsen Hein -
r2912:8fd6925a default
parent child Browse files
Show More
@@ -1,26 +1,26 b''
1 1 #!/bin/sh
2 2
3 3 HGRCPATH=$HGTMP/.hgrc; export HGRCPATH
4 4 echo "[extensions]" >> $HGTMP/.hgrc
5 5 echo "extdiff=" >> $HGTMP/.hgrc
6 6
7 7 hg init a
8 8 cd a
9 9 echo a > a
10 10 hg add
11 11 hg extdiff -o -Nr
12 12
13 13 echo "[extdiff]" >> $HGTMP/.hgrc
14 14 echo "cmd.falabala=echo" >> $HGTMP/.hgrc
15 15 echo "opts.falabala=diffing" >> $HGTMP/.hgrc
16 16
17 17 hg falabala
18 18
19 19 hg help falabala
20 20
21 21 hg ci -d '0 0' -mtest1
22 22
23 23 echo b >> a
24 24 hg ci -d '1 0' -mtest2
25 25
26 hg falabala -r 0:1
26 hg falabala -r 0:1 || echo "diff-like tools yield a non-zero exit code"
@@ -1,31 +1,32 b''
1 1 adding a
2 2 making snapshot of 0 files from rev 000000000000
3 3 making snapshot of 1 files from working dir
4 4 diff -Nr a.000000000000/a a/a
5 5 0a1
6 6 > a
7 7 making snapshot of 0 files from rev 000000000000
8 8 making snapshot of 1 files from working dir
9 9 diffing a.000000000000 a
10 10 hg falabala [OPT]... [FILE]...
11 11
12 12 use 'echo' to diff repository (or selected files)
13 13
14 14 Show differences between revisions for the specified
15 15 files, using the 'echo' program.
16 16
17 17 When two revision arguments are given, then changes are
18 18 shown between those revisions. If only one revision is
19 19 specified then that revision is compared to the working
20 20 directory, and, when no revisions are specified, the
21 21 working directory files are compared to its parent.
22 22
23 23 options:
24 24
25 25 -o --option pass option to comparison program
26 26 -r --rev revision
27 27 -I --include include names matching the given patterns
28 28 -X --exclude exclude names matching the given patterns
29 29 making snapshot of 1 files from rev e27a2475d60a
30 30 making snapshot of 1 files from rev 5e49ec8d3f05
31 31 diffing a.e27a2475d60a a.5e49ec8d3f05
32 diff-like tools yield a non-zero exit code
General Comments 0
You need to be logged in to leave comments. Login now