view tests/test-convert-darcs.out @ 5675:a5fe27b83a4a

Issue 882: add standard hook to reject text files with CRLF.
While the win32text extension does LF <-> CRLF conversion, and will issue a
warning in case a file already in the repository uses CRLF, it provides no
mechanism for verifying that incoming changes use LF. In a large development
team with some Windows users, it is virtually guaranteed that someone will
forget to set up the encode filter correctly and accidentally check in a file
using CRLF, which can cause warnings for other Windows users when they next
fetch changes. Since this is a general problem it is desirable to have a
pre-commit (or -push) hook available to reject such accidents earlier rather
than trying to fix them up after the fact.

% initialize darcs repo
Finished recording patch 'p0'
% branch and update

Copying patch 1 of 1...
Copying patch 1 of 1... done.
Finished getting.
Finished recording patch 'p1.1'
% update source
Finished recording patch 'p1.2'
% merge branch
We have conflicts in the following files:
./a
Finished pulling and applying.
Finished recording patch 'p2'
initializing destination darcs-repo-hg repository
scanning source...
sorting...
converting...
3 p0
2 p1.2
1 p1.1
0 p2
o  3 "p2" files: a
|
o  2 "p1.1" files:
|
o  1 "p1.2" files: a b
|
o  0 "p0" files: a

7225b30cdf38257d5cc7780772c051b6f33e6d6b 644   a
1e88685f5ddec574a34c70af492f95b6debc8741 644   b