Adrian Buehlmann <adrian@cadifra.com> [Mon, 25 Jun 2012 19:26:29 +0200] rev 17051
win32: remove uneeded usage of _STARTF_USESHOWWINDOW
spawndetached() was the only user of _STARTF_USESHOWWINDOW and it creates the
process with _CREATE_NO_WINDOW anyway. If the process has no window, then
there is nothing to hide.
Adrian Buehlmann <adrian@cadifra.com> [Mon, 25 Jun 2012 19:11:29 +0200] rev 17050
win32: specify _CREATE_NO_WINDOW on spawndetached()
Before this change, a console window briefly popped up on "hg serve -d" and
disappeared again, stealing the focus window (which was very annyoing when
running tests).
Specifying _CREATE_NO_WINDOW instead of _DETACHED_PROCESS fixes this (as tested
on Windows 7 x64).
Idan Kamara <idankk86@gmail.com> [Sat, 23 Jun 2012 19:57:29 +0300] rev 17049
amend: disable hooks when creating intermediate commit (issue3501)
Idan Kamara <idankk86@gmail.com> [Sat, 23 Jun 2012 19:57:07 +0300] rev 17048
ui: add a variable to control whether hooks should be called
So hooks can be temporarily disabled.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 28 Jun 2012 18:39:16 +0200] rev 17047
strip: update help to state than you can strip public changeset
Multiple people have been confused by it.
David Schleimer <dschleimer@fb.com> [Fri, 22 Jun 2012 11:40:31 -0700] rev 17046
bookmarks: correctly update current bookmarks on rebase (issue2277)
When you rebased with a currently active bookmark, that bookmark would
always point at the new tip, regardless of what revision it pointed at
before the rebase.
All bookmarks will now point at the equivalent post-rebase commit.
However, the currently active bookmark will cease to be active unless
it points at the new tip post-rebase. Rebase will always leave the
new tip as the working copy parent, which is incompatible with having
an active bookmark that points at some other revision. The common
case should be that the active bookmark will point at the new tip
post-rebase.
Yuya Nishihara <yuya@tcha.org> [Sat, 16 Jun 2012 17:05:55 +0900] rev 17045
graft: don't drop the second parent on unsuccessful merge (issue3498)
This replicates the strategy of rebase, which postpones setparents and
duplicatecopies after checking the merge stats.
Without the second parent, resolve cannot redo merge.
Mads Kiilerich <mads@kiilerich.com> [Wed, 27 Jun 2012 02:34:58 +0200] rev 17044
tests: add missing path globbing for Windows in svn tests
Sune Foldager <cryo@cyanite.org> [Tue, 26 Jun 2012 23:05:25 +0200] rev 17043
fix push of moved bookmark when creating new branch heads
The problem occured when pushing a changeset that at the same time creates a
new named branch head and moves a bookmark. The code invoked methods that only
exist on localrepo instances, so it failed for any other type of remote. The
test suite only tested against local remotes.
Matt Mackall <mpm@selenic.com> [Tue, 26 Jun 2012 15:08:10 -0500] rev 17042
merge with stable