Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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-diffdir.out
author Giorgos Keramidas <keramida@ceid.upatras.gr>
Wed, 13 Jun 2007 15:02:09 +0300
changeset 4566 9b3a818adae6
parent 4208 f80cf8b7bbd9
permissions -rw-r--r--
test-patchbomb: sed -e may not work with extended regexps Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD) may not support extended regexps (i.e. including \| branches), or may need a special option to enable it (like -E instead of -e). Expand the sed RE in tests/test-patchbomb to fix running this test on FreeBSD and Solaris.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4208
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset 
     1
 
diff -r acd8075edac9 b
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset 
     2
 
--- /dev/null
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset 
     3
 
+++ b/b
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset 
     4
 
@@ -0,0 +1,1 @@
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset 
     5
 
+123
4208
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset 
     6
 
diff -r acd8075edac9 b
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset 
     7
 
--- /dev/null
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset 
     8
 
+++ b/b
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset 
     9
 
@@ -0,0 +1,1 @@
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset 
    10
 
+123
4208
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset 
    11
 
diff -r acd8075edac9 a
1723
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset 
    12
 
--- a/a
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset 
    13
 
+++ b/a
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset 
    14
 
@@ -0,0 +1,1 @@
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset 
    15
 
+foo
4208
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset 
    16
 
diff -r acd8075edac9 b
1723
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset 
    17
 
--- /dev/null
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset 
    18
 
+++ b/b
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset 
    19
 
@@ -0,0 +1,1 @@
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset 
    20
 
+123
3822
000d122071b5 fix hg diff -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset 
    21
 
abort: Ambiguous identifier!
000d122071b5 fix hg diff -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset 
    22
 
abort: Ambiguous identifier!
mercurial-crew-with-dirclash