Mercurial > hg
annotate tests/test-clone.out @ 8810:ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
The intent is to fix many issues involving patching when win32ext is enabled.
With win32ext, the working directory and repository files EOLs are not the same
which means that patches made on a non-win32ext host do not apply cleanly
because of EOLs discrepancies. A theorically correct approach would be
transform either the patched file or the patch content with the
encoding/decoding filters used by win32ext. This solution is tricky to
implement and invasive, instead we prefer to address the win32ext case, by
offering a way to ignore input EOLs when patching and rewriting them when
saving the patched result.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 15 Jun 2009 00:03:26 +0200 |
parents | a218ba5f60df |
children | a3d73b3e1f8a |
rev | line source |
---|---|
6947
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
1 |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
2 % prepare repo a |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
3 % list files in store/data (should show a 'b.d') |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
4 .hg/store/data/a.i |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
5 .hg/store/data/b.d |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
6 .hg/store/data/b.i |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
7 |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
8 % default operation |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
6088
diff
changeset
|
9 updating working directory |
6947
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
10 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
550 | 11 a |
12 checking changesets | |
13 checking manifests | |
14 crosschecking files in changesets and manifests | |
15 checking files | |
6947
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
16 2 files, 11 changesets, 11 total revisions |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
17 |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
18 % no update |
1926
ba198d17eea9
changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents:
925
diff
changeset
|
19 a not present |
550 | 20 checking changesets |
21 checking manifests | |
22 crosschecking files in changesets and manifests | |
23 checking files | |
6947
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
24 2 files, 11 changesets, 11 total revisions |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
25 |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
26 % default destination |
3841
aaeb7f5d1052
Show the destionation for clone if not specified manually.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2175
diff
changeset
|
27 destination directory: a |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
6088
diff
changeset
|
28 updating working directory |
6947
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
29 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
550 | 30 a |
6947
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
31 |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
32 % check that we drop the file:// from the path before |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
33 % writing the .hgrc |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
6088
diff
changeset
|
34 updating working directory |
6947
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
35 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
36 |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
37 % check that path aliases are expanded |
6088
3b96cefc1b2b
clone: expand the path before saving it in .hg/hgrc
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5225
diff
changeset
|
38 a#0 |
6947
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
39 |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
40 % use --pull |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
41 requesting all changes |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
42 adding changesets |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
43 adding manifests |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
44 adding file changes |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
45 added 11 changesets with 11 changes to 2 files |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
46 updating working directory |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
47 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
48 checking changesets |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
49 checking manifests |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
50 crosschecking files in changesets and manifests |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
51 checking files |
a7fcb43af82e
increase code coverage of test-clone
Adrian Buehlmann <adrian@cadifra.com>
parents:
6338
diff
changeset
|
52 2 files, 11 changesets, 11 total revisions |
7927
a218ba5f60df
allow clone into existing but empty directories
Steve Borho <steve@borho.org>
parents:
6947
diff
changeset
|
53 |
a218ba5f60df
allow clone into existing but empty directories
Steve Borho <steve@borho.org>
parents:
6947
diff
changeset
|
54 % clone to . |
a218ba5f60df
allow clone into existing but empty directories
Steve Borho <steve@borho.org>
parents:
6947
diff
changeset
|
55 updating working directory |
a218ba5f60df
allow clone into existing but empty directories
Steve Borho <steve@borho.org>
parents:
6947
diff
changeset
|
56 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |