##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: unify test-diff-hashes
Adrian Buehlmann -
r12137:e1814ff2 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,27 +1,45 b''
1 #!/bin/sh
1 $ hg init a
2 $ cd a
3
4 $ hg diff inexistent1 inexistent2
5 inexistent1: No such file or directory
6 inexistent2: No such file or directory
2
7
3 hg init a
8 $ echo bar > foo
4 cd a
9 $ hg add foo
5 hg diff not found
10 $ hg ci -m 'add foo' -d '1000000 0'
6 echo bar > foo
11
7 hg add foo
12 $ echo foobar > foo
8 hg ci -m 'add foo' -d '1000000 0'
13 $ hg ci -m 'change foo' -d '1000001 0'
9
14
10 echo foobar > foo
15 $ hg --quiet diff -r 0 -r 1
11 hg ci -m 'change foo' -d '1000001 0'
16 --- a/foo Mon Jan 12 13:46:40 1970 +0000
17 +++ b/foo Mon Jan 12 13:46:41 1970 +0000
18 @@ -1,1 +1,1 @@
19 -bar
20 +foobar
12
21
13 echo 'quiet:'
22 $ hg diff -r 0 -r 1
14 hg --quiet diff -r 0 -r 1
23 diff -r 74de3f1392e2 -r b8b5f023a6ad foo
15 echo
24 --- a/foo Mon Jan 12 13:46:40 1970 +0000
16
25 +++ b/foo Mon Jan 12 13:46:41 1970 +0000
17 echo 'normal:'
26 @@ -1,1 +1,1 @@
18 hg diff -r 0 -r 1
27 -bar
19 echo
28 +foobar
20
29
21 echo 'verbose:'
30 $ hg --verbose diff -r 0 -r 1
22 hg --verbose diff -r 0 -r 1
31 diff -r 74de3f1392e2 -r b8b5f023a6ad foo
23 echo
32 --- a/foo Mon Jan 12 13:46:40 1970 +0000
33 +++ b/foo Mon Jan 12 13:46:41 1970 +0000
34 @@ -1,1 +1,1 @@
35 -bar
36 +foobar
24
37
25 echo 'debug:'
38 $ hg --debug diff -r 0 -r 1
26 hg --debug diff -r 0 -r 1
39 diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo
27 echo
40 --- a/foo Mon Jan 12 13:46:40 1970 +0000
41 +++ b/foo Mon Jan 12 13:46:41 1970 +0000
42 @@ -1,1 +1,1 @@
43 -bar
44 +foobar
45
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now