Thu, 08 Oct 2009 10:39:43 +0200 rebase: return early when source is descendant of destination
Sune Foldager <cryo@cyanite.org> [Thu, 08 Oct 2009 10:39:43 +0200] rev 9578
rebase: return early when source is descendant of destination This only happens when using --base (or no source selection options), as rebase already aborts in this situation when using --source. Without this change you get an abort from the underlying merge, and the repository is in a different state than you started with (the working dir parent is changed).
Thu, 08 Oct 2009 10:07:41 +0200 rebase: improve error and debug messages
Sune Foldager <cryo@cyanite.org> [Thu, 08 Oct 2009 10:07:41 +0200] rev 9577
rebase: improve error and debug messages
Sun, 11 Oct 2009 13:54:19 -0500 Merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 11 Oct 2009 13:54:19 -0500] rev 9576
Merge with stable
Sat, 10 Oct 2009 12:19:58 +0200 merge with hg-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:19:58 +0200] rev 9575
merge with hg-stable
Sat, 10 Oct 2009 12:00:43 +0200 encoding: fix issue with non-standard UTF-8 CTYPE on OS X
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:00:43 +0200] rev 9574
encoding: fix issue with non-standard UTF-8 CTYPE on OS X
Thu, 08 Oct 2009 23:42:33 +0200 patch: do not swallow header-like patch first line (issue1859)
Patrick Mezard <pmezard@gmail.com> [Thu, 08 Oct 2009 23:42:33 +0200] rev 9573
patch: do not swallow header-like patch first line (issue1859) Current solution is hackish but looks like a good trade-off short of rewriting patch.extract() significantly.
Thu, 08 Oct 2009 23:32:36 +0200 windows: fix unlink() not dropping empty tree (issue1861)
Patrick Mezard <pmezard@gmail.com> [Thu, 08 Oct 2009 23:32:36 +0200] rev 9572
windows: fix unlink() not dropping empty tree (issue1861)
(0) -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip