6 Commits

Author	SHA1	Message	Date
Adrian Buehlmann	41df87291e	test-histedit-fold: fix for Windows ... Fixes 6d445c2db0df failing with MSYS. MSYS sh.exe mangled that path by applying its path magic, which caused the test to fail on Windows.	2012-07-26 23:08:34 +02:00
Patrick Mezard	e7c675580e	histedit: fix new nodes computation with --continue (issue3534) ... When running the following actions: pick 617f94f13c0f 1 +4 drop 888f9082bf99 2 +5 fold 251d831eeec5 3 +6 if the fold fails, is fixed by the user with a new changeset, --continue will ignore the new revision when generating the fold changelog. This was caused by --continue detecting new changesets as descendants of the parent not descendants of changesets in the initial list. In this case, dropped changesets must be ignored. Even with the computation fixed, the 'newchildren' list was always emptied by the filtering loop and passed empty to finishfold(). Note that changesets dropped and recreated identically will still be missed. This probably cannot be solved but is unlikely to happen. Other things, like 'newchildren' having multiple heads, should be checked as well.	2012-07-25 16:27:26 +02:00
Augie Fackler	39b1dce60e	histedit: don't crash if the result of fixing up a fold is empty	2012-07-06 11:39:02 -05:00
Mads Kiilerich	e1e9922b2d	tests: make histedit pass on Windows MSYS ... The command file will now be named with $TESTTMP (with '\') instead of `pwd` (with '/') to avoid wrong path conversions.	2012-07-02 01:47:59 +02:00
Mads Kiilerich	9fd035159b	tests: make histedit tests more resilient to filesystem variation ... Better quoting of odd filesystem paths and no dependency to execute bit.	2012-06-30 03:34:50 +02:00
Mads Kiilerich	db710d2031	tests: convert histedit tests to .t ... Mostly a trivial conversion.	2012-06-30 03:34:44 +02:00