Maxim Dounin <mdounin@mdounin.ru> [Mon, 05 Nov 2007 20:05:44 +0300] rev 5487
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
Rocco Rutte <pdmef@gmx.net> [Sat, 03 Nov 2007 17:04:42 +0100] rev 5486
hgweb_mod: update unidiff() calls and finish e5eedd74e70f job
Bryan O'Sullivan <bos@serpentine.com> [Fri, 02 Nov 2007 14:44:33 -0700] rev 5485
Fix context iterator.
"Rafael Villar Burke <pachi@rvburke.com>" [Fri, 02 Nov 2007 20:09:21 +0100] rev 5484
Update convert help text
Add Mercurial as a source format, clarify that the include directive triggers the exclusion of all not explicitely included files/dirs and use MAPFILE instead of revmapfile in the text, following the short message convention.
Hollis Blanchard <hollisb@us.ibm.com> [Thu, 01 Nov 2007 17:15:50 -0500] rev 5483
Handle patches with misformatted empty lines
Insert a space on empty lines which are missing a control character.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
---
I frequently receive emailed patches with empty lines represented as "\n\n",
where Mercurial expects them to be "\n \n". patch(1) applies these patches
without complaint, but qpush fails all hunks.
Dustin Sallings <dustin@spy.net> [Thu, 01 Nov 2007 12:17:59 -0700] rev 5482
Use both the from and to name in mdiff.unidiff.
This fixes a compatibility issue with git diffs.
* * *
Patrick Mezard <pmezard@gmail.com> [Thu, 01 Nov 2007 12:05:14 +0100] rev 5481
Fix Windows os.popen bug with interleaved stdout/stderr output
See python bug 1366 "popen spawned process may not write to stdout under windows" for more details.
Elliott Peele <elliot@rpath.com> [Tue, 30 Oct 2007 16:54:25 -0700] rev 5480
https url handling: usernames and passwords were registered to the wrong url