view tests/test-permissions.out @ 12317:ed639917c825 stable

test-eol-update: record new results as correct Changeset 0852da25a31b changed the result of this test. The 'hg update 0' command, which causes a merge of modified a.txt, now leaves a.txt in the EOLN format specified by .hgeol as it was committed in revision 0. Previously, it used the .hgeol contents from the working directory before the update.
author Steve Borho <steve@borho.org>
date Fri, 17 Sep 2010 12:44:35 -0500
parents 6f750e76fb46
children c1b11ee12fe7
line wrap: on
line source

checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
verify failed
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
commit failed
diff -r c1fab96507ef a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-foo
+barber
M a
? dir/a
dir: Permission denied
M a