##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Add patch.eol to ignore EOLs when patching (issue1019)...
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.
Benoit Boissinot - - Load All Authors

File last commit:

r8518:3f4f14ea default
r8810:ac92775b default
Show More
test-transplant.out
161 lines | 4.0 KiB | text/plain | TextLexer
/ tests / test-transplant.out
History | Source | Raw |Copy content |Copy permalink
Brendan Cully
Add transplant extension
 r3714 adding r1
adding r2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding b1
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Brendan Cully
Add transplant extension
 r3714 adding b2
adding b3
4 b3
3 b2
2 0:17ab29e464c6 b1
1 r2
0 r1
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Brendan Cully
Add transplant extension
 r3714 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 3 files removed, 0 files unresolved
% rebase b onto r1
applying 37a1297eb21b
37a1297eb21b transplanted to e234d668f844
applying 722f4667af76
722f4667af76 transplanted to 539f377d78df
applying a53251cdf717
a53251cdf717 transplanted to ffd6818a3975
7 b3
6 b2
5 1:d11e3596cc1a b1
4 b3
3 b2
2 0:17ab29e464c6 b1
1 r2
0 r1
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Brendan Cully
Add transplant extension
 r3714 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 3 files removed, 0 files unresolved
% rebase b onto r1, skipping b2
applying 37a1297eb21b
37a1297eb21b transplanted to e234d668f844
applying a53251cdf717
a53251cdf717 transplanted to 7275fda4d04f
6 b3
5 1:d11e3596cc1a b1
4 b3
3 b2
2 0:17ab29e464c6 b1
1 r2
0 r1
% remote transplant
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Brendan Cully
Add transplant extension
 r3714 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
searching for changes
applying 37a1297eb21b
37a1297eb21b transplanted to c19cf0ccb069
applying a53251cdf717
a53251cdf717 transplanted to f7fe5bf98525
3 b3
(transplanted from a53251cdf717679d1907b289f991534be05c997a)
2 b1
(transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
1 r2
0 r1
% skip previous transplants
searching for changes
applying 722f4667af76
722f4667af76 transplanted to 47156cd86c0b
4 b2
3 b3
(transplanted from a53251cdf717679d1907b289f991534be05c997a)
2 b1
(transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
1 r2
0 r1
% skip local changes transplanted to the source
adding b4
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Brendan Cully
Add transplant extension
 r3714 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
searching for changes
applying 4333daefcb15
4333daefcb15 transplanted to 5f42c04e07cc
Brendan Cully
Make test-transplant test pull case
 r4036 % remote transplant with pull
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Brendan Cully
Make test-transplant test pull case
 r4036 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
searching for changes
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
applying a53251cdf717
a53251cdf717 transplanted to 8d9279348abb
2 b3
1 b1
0 r1
Brendan Cully
transplant: fix --continue; add --continue test
 r3724 % transplant --continue
adding foo
Brendan Cully
transplant: recover added/removed files after failed application
 r3726 adding toremove
adding added
removing toremove
Brendan Cully
transplant: fix --continue; add --continue test
 r3724 adding bar
Brendan Cully
transplant: recover added/removed files after failed application
 r3726 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Brendan Cully
transplant: recover added/removed files after failed application
 r3726 applying a1e30dd1b8e7
Bryan O'Sullivan
Update test output to reflect small changes in patch chattiness.
 r4901 patching file foo
Hunk #1 FAILED at 0
Martin Geisler
i18n: avoid naive plural tricks
 r6952 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
Bryan O'Sullivan
Update test output to reflect small changes in patch chattiness.
 r4901 patch failed to apply
Brendan Cully
transplant: fix --continue; add --continue test
 r3724 abort: Fix up the merge and run hg transplant --continue
Benoit Boissinot
update --clean: do not unlink added files (issue575)
 r8518 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Brendan Cully
transplant: log source node when recovering too.
 r3758 applying a1e30dd1b8e7
Bryan O'Sullivan
Update test output to reflect small changes in patch chattiness.
 r4901 patching file foo
Hunk #1 FAILED at 0
Martin Geisler
i18n: avoid naive plural tricks
 r6952 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
Bryan O'Sullivan
Update test output to reflect small changes in patch chattiness.
 r4901 patch failed to apply
Brendan Cully
transplant: log source node when recovering too.
 r3758 abort: Fix up the merge and run hg transplant --continue
a1e30dd1b8e7 transplanted as f1563cf27039
skipping already applied revision 1:a1e30dd1b8e7
Brendan Cully
transplant: recover added/removed files after failed application
 r3726 applying 1739ac5f6139
Brendan Cully
transplant: log source node when recovering too.
 r3758 1739ac5f6139 transplanted to d649c221319f
Brendan Cully
transplant: recover added/removed files after failed application
 r3726 applying 0282d5fbbe02
Brendan Cully
transplant: log source node when recovering too.
 r3758 0282d5fbbe02 transplanted to 77418277ccb3
Brendan Cully
transplant: recover added/removed files after failed application
 r3726 added
bar
foo
Patrick Mezard
localrepo: fix partial merge test (issue 1111)
 r6639 % test transplant merge
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% tranplant
applying 42dc4432fd35
1:42dc4432fd35 merged at a9f4acbac129
Jacob Lee
transplant: remove the restriction that the destination be nonempty....
 r8173 % test transplant into empty repository
requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files
% test filter
filtering
applying 17ab29e464c6
17ab29e464c6 transplanted to e9ffc54ea104
filtering
applying 37a1297eb21b
37a1297eb21b transplanted to 348b36d0b6a5
filtering
applying 722f4667af76
722f4667af76 transplanted to 0aa6979afb95
filtering
applying a53251cdf717
a53251cdf717 transplanted to 14f8512272b5
3 b3
2 b2
1 b1
0 r2