Mercurial > hg
annotate tests/test-diff-hashes.out @ 6339:ed9b07a97587
util: check fileno() validity in win32 set_binary()
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 21 Mar 2008 21:56:55 +0100 |
parents | 3d1f9dcecdea |
children |
rev | line source |
---|---|
5689
c2d0ed7f4af8
Move diffing missing file test and remove test-notfound
Patrick Mezard <pmezard@gmail.com>
parents:
3387
diff
changeset
|
1 found: No such file or directory |
c2d0ed7f4af8
Move diffing missing file test and remove test-notfound
Patrick Mezard <pmezard@gmail.com>
parents:
3387
diff
changeset
|
2 not: No such file or directory |
3387
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
3 quiet: |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
4 --- a/foo Mon Jan 12 13:46:40 1970 +0000 |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 +++ b/foo Mon Jan 12 13:46:41 1970 +0000 |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
5689
diff
changeset
|
6 @@ -1,1 +1,1 @@ |
3387
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
7 -bar |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
8 +foobar |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
9 |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 normal: |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 diff -r 74de3f1392e2 -r b8b5f023a6ad foo |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
12 --- a/foo Mon Jan 12 13:46:40 1970 +0000 |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
13 +++ b/foo Mon Jan 12 13:46:41 1970 +0000 |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
5689
diff
changeset
|
14 @@ -1,1 +1,1 @@ |
3387
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
15 -bar |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
16 +foobar |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
17 |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
18 verbose: |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
19 diff -r 74de3f1392e2 -r b8b5f023a6ad foo |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
20 --- a/foo Mon Jan 12 13:46:40 1970 +0000 |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
21 +++ b/foo Mon Jan 12 13:46:41 1970 +0000 |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
5689
diff
changeset
|
22 @@ -1,1 +1,1 @@ |
3387
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
23 -bar |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
24 +foobar |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
25 |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
26 debug: |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
27 diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
28 --- a/foo Mon Jan 12 13:46:40 1970 +0000 |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
29 +++ b/foo Mon Jan 12 13:46:41 1970 +0000 |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
5689
diff
changeset
|
30 @@ -1,1 +1,1 @@ |
3387
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
31 -bar |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
32 +foobar |
2065789f6a3e
use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
33 |