Mercurial > hg

comparison tests/test-diff-change.t @ 26019:85f5352c7ca7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revpair: update test to make a difference if odd range not handled specially It was added at 2a0efa1112ac, but there was no difference between -r2 and -r2:2 because the working directory was clean.
author Yuya Nishihara <yuya@tcha.org>
date Thu, 13 Aug 2015 16:27:32 +0900
parents f2719b387380
children cc3a30ff9490
comparison
equal deleted inserted replaced
26018:c6115c30a376 26019:85f5352c7ca7
27 +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000 27 +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
28 @@ -1,1 +1,1 @@ 28 @@ -1,1 +1,1 @@
29 -first 29 -first
30 +second 30 +second
31 31
32 $ cd ..
33
32 Test dumb revspecs (issue3474) 34 Test dumb revspecs (issue3474)
35
36 $ hg clone -q a dumbspec
37 $ cd dumbspec
38 $ echo "wdir" > file.txt
33 39
34 $ hg diff -r 2:2 40 $ hg diff -r 2:2
35 $ hg diff -r "2 and 1" 41 $ hg diff -r "2 and 1"
36 abort: empty revision range 42 abort: empty revision range
37 [255] 43 [255]
38 44
45 $ cd ..
46
39 Testing diff --change when merge: 47 Testing diff --change when merge:
48
49 $ cd a
40 50
41 $ for i in 1 2 3 4 5 6 7 8 9 10; do 51 $ for i in 1 2 3 4 5 6 7 8 9 10; do
42 > echo $i >> file.txt 52 > echo $i >> file.txt
43 > done 53 > done
44 $ hg commit -m "lots of text" # 3 54 $ hg commit -m "lots of text" # 3