Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-diffdir.out @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents f80cf8b7bbd9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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!