Mercurial > hg

annotate tests/test-permissions.out @ 7104:9514cbb6e4f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 14 Oct 2008 20:13:53 +0200
parents 6f750e76fb46
children c1b11ee12fe7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1497
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 checking changesets
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 checking manifests
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 crosschecking files in changesets and manifests
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 checking files
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5 1 files, 1 changesets, 1 total revisions
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
6 checking changesets
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
7 checking manifests
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 crosschecking files in changesets and manifests
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
9 checking files
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
10 verify failed
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
11 checking changesets
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
12 checking manifests
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
13 crosschecking files in changesets and manifests
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
14 checking files
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
15 1 files, 1 changesets, 1 total revisions
f0b13c019b04 Add permissions handling test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
16 commit failed
5215
74723744d8e0 fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2152
diff changeset
17 diff -r c1fab96507ef a
74723744d8e0 fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2152
diff changeset
18 --- a/a
74723744d8e0 fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2152
diff changeset
19 +++ b/a
5863
3d1f9dcecdea diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents: 5215
diff changeset
20 @@ -1,1 +1,1 @@
5215
74723744d8e0 fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2152
diff changeset
21 -foo
74723744d8e0 fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2152
diff changeset
22 +barber
7099
6f750e76fb46 dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5863
diff changeset
23 M a
6f750e76fb46 dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5863
diff changeset
24 ? dir/a
6f750e76fb46 dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5863
diff changeset
25 dir: Permission denied
6f750e76fb46 dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5863
diff changeset
26 M a