Mads Kiilerich <mads@kiilerich.com> [Tue, 01 Feb 2011 01:55:45 +0100] rev 13329
merge with stable
Yuya Nishihara <yuya@tcha.org> [Sat, 29 Jan 2011 23:23:24 +0900] rev 13328
url: add --insecure option to bypass verification of ssl certificates
If --insecure specified, it behaves in the same way as no web.cacerts
configured.
Also shows hint for --insecure option when _verifycert() failed. But currently
the hint isn't displayed on SSLError, because it needs a certain level of
changes.
Patrick Mezard <pmezard@gmail.com> [Mon, 31 Jan 2011 22:16:33 +0100] rev 13327
mq: factor out push conditions checks
Some extensions (e.g. hgsubversion) completely override push command. Because
extensions load order is unspecified, if hgsubversion loads before mq, mq
checks about not pushing applied patches will be bypassed. Short of finding a
way to fix load order, extracting the checking logic will allow
hgsubversion-like extensions to run the check themselves.
Kevin Bullock <kbullock@ringworld.org> [Thu, 27 Jan 2011 15:51:26 -0600] rev 13326
test-subrepo-mq-svn.t: correct comment
This fixes the description of a helper function in the test.
Kevin Bullock <kbullock@ringworld.org> [Tue, 04 Jan 2011 10:42:00 -0600] rev 13325
subrepo: clarify comments in dirty() methods
Just a little change to bring the comments in the dirty() methods of the
various subrepo classes into a uniform structure. This clarifies the
meaning of the states checked.
Erik Zielke <ez@aragost.com> [Mon, 31 Jan 2011 13:40:05 +0100] rev 13324
subrepo: make update -C clean the working directory for git subrepos
This makes 'hg update --clean' behave the same way for all three kinds
of subrepositories [hg, svn, git]. Before git subrepos did not take
the clean parameter into account, but just updated to the given
revision and merged uncommitted changes into that.
Martin Geisler <mg@aragost.com> [Mon, 31 Jan 2011 13:38:00 +0100] rev 13323
merge with stable
Erik Zielke <ez@aragost.com> [Mon, 31 Jan 2011 13:33:41 +0100] rev 13322
subrepo: make update -C clean the working directory for svn subrepos
This makes 'hg update --clean' behave the same way for both kinds of
subrepositories. Before Subversion subrepos did not take the clean
parameter into account, but just updated to the given revision and
merged uncommitted changes into that.
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:08:49 -0600] rev 13321
Added signature for changeset a6c855c32ea0
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:08:46 -0600] rev 13320
Added tag 1.7.4 for changeset a6c855c32ea0