equal
deleted
inserted
replaced
|
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 |
|
7 |
|
8 $ echo bar > foo |
|
9 $ hg add foo |
|
10 $ hg ci -m 'add foo' -d '1000000 0' |
|
11 |
|
12 $ echo foobar > foo |
|
13 $ hg ci -m 'change foo' -d '1000001 0' |
|
14 |
|
15 $ hg --quiet diff -r 0 -r 1 |
|
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 |
|
21 |
|
22 $ hg diff -r 0 -r 1 |
|
23 diff -r 74de3f1392e2 -r b8b5f023a6ad foo |
|
24 --- a/foo Mon Jan 12 13:46:40 1970 +0000 |
|
25 +++ b/foo Mon Jan 12 13:46:41 1970 +0000 |
|
26 @@ -1,1 +1,1 @@ |
|
27 -bar |
|
28 +foobar |
|
29 |
|
30 $ hg --verbose diff -r 0 -r 1 |
|
31 diff -r 74de3f1392e2 -r b8b5f023a6ad foo |
|
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 |
|
37 |
|
38 $ hg --debug diff -r 0 -r 1 |
|
39 diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo |
|
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 |