Mercurial: Changelog

Mercurial Mercurial > hg / changelog

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | zip | gz | bz2 | help
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip

Mon, 20 Dec 2010 13:59:33 -0500 subrepo: support ignoreupdate in gitsubrepo's dirty()

Eric Eisner <ede@mit.edu> [Mon, 20 Dec 2010 13:59:33 -0500] rev 13179

subrepo: support ignoreupdate in gitsubrepo's dirty()

Mon, 20 Dec 2010 13:59:19 -0500 subrepo: backout 519ac79d680b

Eric Eisner <ede@mit.edu> [Mon, 20 Dec 2010 13:59:19 -0500] rev 13178

subrepo: backout 519ac79d680b Unfortunately git 1.6 does not support the upstream parameter in for-each-ref.

Mon, 20 Dec 2010 12:12:18 -0600 url: fix check-code whitespace complaint

Matt Mackall <mpm@selenic.com> [Mon, 20 Dec 2010 12:12:18 -0600] rev 13177

url: fix check-code whitespace complaint

Mon, 20 Dec 2010 12:09:00 -0600 templater: use the parser.py parser to extend the templater syntax

Matt Mackall <mpm@selenic.com> [Mon, 20 Dec 2010 12:09:00 -0600] rev 13176

templater: use the parser.py parser to extend the templater syntax

Mon, 20 Dec 2010 12:09:00 -0600 templater: give slightly nicer error for unknown map entries

Matt Mackall <mpm@selenic.com> [Mon, 20 Dec 2010 12:09:00 -0600] rev 13175

templater: give slightly nicer error for unknown map entries

Tue, 07 Dec 2010 22:14:43 -0600 mq: update .hgsubstate if subrepos are clean (issue2499)

Kevin Bullock <kbullock@ringworld.org> [Tue, 07 Dec 2010 22:14:43 -0600] rev 13174

mq: update .hgsubstate if subrepos are clean (issue2499) This patch prevents MQ from creating an inconsistent subrepo state. If the .hgsub file has been changed, and none of the subrepos have uncommitted changes, creating or updating a patch (using qnew, qrefresh, or qrecord) will update .hgsubstate accordingly. If any subrepos _do_ have uncommitted changes, qnew/qrefresh/qrecord will abort. Thanks to pmezard for proposing this solution.

Tue, 07 Dec 2010 22:14:43 -0600 backout f08df4d38442

Kevin Bullock <kbullock@ringworld.org> [Tue, 07 Dec 2010 22:14:43 -0600] rev 13173

backout f08df4d38442

Fri, 17 Dec 2010 13:38:15 +0100 subrepo: backout f02d7a562a21

Erik Zielke <ez@aragost.com> [Fri, 17 Dec 2010 13:38:15 +0100] rev 13172

subrepo: backout f02d7a562a21 backing out f02d7a562a21 because it introduced a bug in .hgsubstate handling.

Mon, 20 Dec 2010 12:08:56 -0600 merge with i18n

Matt Mackall <mpm@selenic.com> [Mon, 20 Dec 2010 12:08:56 -0600] rev 13171

merge with i18n

Mon, 20 Dec 2010 12:08:50 -0600 merge with stable

Matt Mackall <mpm@selenic.com> [Mon, 20 Dec 2010 12:08:50 -0600] rev 13170

merge with stable

(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip

Mercurial