Mon, 15 Jun 2009 20:35:19 -0400 test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12.
Greg Ward <greg-hg@gerg.ca> [Mon, 15 Jun 2009 20:35:19 -0400] rev 8819
test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12. - factor out cvsci function (similar to other test-convert-cvs* scripts) - add filterpath function (also similar to other scripts) - generally munge the output of CVS - add lots of output to make it easier to follow when things go wrong This doesn't make the test pass reliably under CVS 1.11; it just makes it behave the same as under CVS 1.12, i.e. sometimes it passes and sometimes it fails. Failure is more frequent with faster hardware.
Mon, 15 Jun 2009 20:35:19 -0400 Rename CVSNT "mergepoints" test and make it executable.
Greg Ward <greg-hg@gerg.ca> [Mon, 15 Jun 2009 20:35:19 -0400] rev 8818
Rename CVSNT "mergepoints" test and make it executable. - rename test-convert-cvs-builtincvsps-cvsnt-mergepoints (and related files) to test-convert-cvsnt-mergepoints - this ensures that the test will be run, but does NOT make it pass: in particularly, it fails regularly for me due to the inconsistent behaviour of CVS itself - expect "Branchpoints:" in debugcvsps output
Tue, 16 Jun 2009 16:22:42 +0100 Fixed patch.eol bug that truncated all patched lines to one character
Colin Caughie <c.caughie@indigovision.com> [Tue, 16 Jun 2009 16:22:42 +0100] rev 8817
Fixed patch.eol bug that truncated all patched lines to one character Also updated the import-eol test to test with lines longer than one character, and also empty lines.
Mon, 15 Jun 2009 02:51:10 -0500 subrepo: add a test
Matt Mackall <mpm@selenic.com> [Mon, 15 Jun 2009 02:51:10 -0500] rev 8816
subrepo: add a test
Mon, 15 Jun 2009 02:46:20 -0500 subrepo: basic push support
Matt Mackall <mpm@selenic.com> [Mon, 15 Jun 2009 02:46:20 -0500] rev 8815
subrepo: basic push support
Mon, 15 Jun 2009 02:45:38 -0500 subrepo: add update/merge logic
Matt Mackall <mpm@selenic.com> [Mon, 15 Jun 2009 02:45:38 -0500] rev 8814
subrepo: add update/merge logic
Mon, 15 Jun 2009 02:45:38 -0500 commit: recurse into subrepositories
Matt Mackall <mpm@selenic.com> [Mon, 15 Jun 2009 02:45:38 -0500] rev 8813
commit: recurse into subrepositories
Mon, 15 Jun 2009 02:45:38 -0500 subrepo: introduce basic state parsing
Matt Mackall <mpm@selenic.com> [Mon, 15 Jun 2009 02:45:38 -0500] rev 8812
subrepo: introduce basic state parsing
Mon, 15 Jun 2009 00:03:27 +0200 Make mq, record and transplant honor patch.eol
Patrick Mezard <pmezard@gmail.com> [Mon, 15 Jun 2009 00:03:27 +0200] rev 8811
Make mq, record and transplant honor patch.eol
Mon, 15 Jun 2009 00:03:26 +0200 Add patch.eol to ignore EOLs when patching (issue1019)
Patrick Mezard <pmezard@gmail.com> [Mon, 15 Jun 2009 00:03:26 +0200] rev 8810
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.
(0) -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip