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-mq-qdiff.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 21 Feb 2008 16:22:31 -0300
changeset 6158 23ffe82615d8
parent 5863 3d1f9dcecdea
child 6668 034f444902d9
permissions -rw-r--r--
repo.status: also compare flags for files in the lookup list. We might be able to do something smarter about this in dirstate.status for files in normallookup state, but that would require some extra care to keep backwards compatibility.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2916
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     1
 
% init
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     2
 
% commit
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     3
 
adding base
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     4
 
% qnew mqbase
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     5
 
% qrefresh
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     6
 
% qdiff
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     7
 
diff -r 67e992f2c4f3 base
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     8
 
--- a/base
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
     9
 
+++ b/base
5863
3d1f9dcecdea diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents: 2916
diff changeset 
    10
 
@@ -1,1 +1,1 @@
2916
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    11
 
-base
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    12
 
+patched
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    13
 
% qdiff dirname
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    14
 
diff -r 67e992f2c4f3 base
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    15
 
--- a/base
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    16
 
+++ b/base
5863
3d1f9dcecdea diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents: 2916
diff changeset 
    17
 
@@ -1,1 +1,1 @@
2916
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    18
 
-base
8ca608c1eb02 tests: new test for mq qdiff command
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset 
    19
 
+patched
Mercurial