Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-diff-hashes.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 01 Jun 2007 16:00:40 +0200
changeset 4472 736e49292809
parent 3387 2065789f6a3e
child 5689 c2d0ed7f4af8
permissions -rw-r--r--
addremove: comparing two empty files caused ZeroDivisionError (found by Giorgos Keramidas)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3387
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
quiet:
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 
--- 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 
     3
 
+++ b/foo	Mon Jan 12 13:46:41 1970 +0000
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     4
 
@@ -1,1 +1,1 @@ bar
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     5
 
-bar
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     6
 
+foobar
2065789f6a3e use short hashes with diff -v
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     7
 












2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     8


normal:













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     9


diff -r 74de3f1392e2 -r b8b5f023a6ad foo













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    10


--- 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




    11


+++ b/foo	Mon Jan 12 13:46:41 1970 +0000













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    12


@@ -1,1 +1,1 @@ bar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    13


-bar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    14


+foobar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    15














2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    16


verbose:













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    17


diff -r 74de3f1392e2 -r b8b5f023a6ad foo













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    18


--- 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




    19


+++ b/foo	Mon Jan 12 13:46:41 1970 +0000













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    20


@@ -1,1 +1,1 @@ bar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    21


-bar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    22


+foobar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    23














2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    24


debug:













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    25


diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    26


--- 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




    27


+++ b/foo	Mon Jan 12 13:46:41 1970 +0000













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    28


@@ -1,1 +1,1 @@ bar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    29


-bar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    30


+foobar













2065789f6a3e
use short hashes with diff -v



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    31
















Mercurial