Mon, 08 Feb 2010 02:53:41 +0100 tests: don't just silently strip port numbers
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Feb 2010 02:53:41 +0100] rev 10398
tests: don't just silently strip port numbers
Sun, 07 Feb 2010 10:47:54 -0500 mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com> [Sun, 07 Feb 2010 10:47:54 -0500] rev 10397
mq: add parent node IDs to MQ patches on qrefresh/qnew The goal of this patch is to add the IDs of the parents of applied MQ patches into the patch file headers whenever qnew or qrefresh are run. This will serve as a reminder of when the patches last applied cleanly and will let us do more intelligent things in the future, such as: * Resolve conflicts found when qpushing to a new location by merging instead of simply showing rejects. * Display better diffs of versioned MQ patches because we can tell how the patched files have changed in the meantime. Here are the new rules this patch introduces. They are checked in this order: * If a patch currently has old, plain-style patch headers ("From:" and "Date:") do not change the style or add any new headers. * If the 'mq.plain' configuration setting is true, only plain-style headers will be used for all MQ patches. * qnew will initialize new patches with HG-style headers and fill in the "# Parent" header with the appropriate parent node. * qrefresh will refresh the "# Parent" header with the current parent of the current patch.
Mon, 08 Feb 2010 19:44:04 +0100 prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Feb 2010 19:44:04 +0100] rev 10396
prepush: add more precise error messages Part of the patch is from timeless@mozdev.org - indicate the branch name where there are multiple heads - give better advice when hitting a possible race, where new heads are added between discovery and the call to branchmap(). In that case, asking the user to merge isn't helpful, since only remote has the changes.
Mon, 08 Feb 2010 17:28:19 +0100 revlog: don't silently discard revlog flags on revlogv0
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Feb 2010 17:28:19 +0100] rev 10395
revlog: don't silently discard revlog flags on revlogv0
Mon, 08 Feb 2010 15:36:34 +0100 fix coding style (reported by pylint)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Feb 2010 15:36:34 +0100] rev 10394
fix coding style (reported by pylint)
Mon, 08 Feb 2010 15:06:26 +0100 add pylintrc with some mercurial specific configuration
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Feb 2010 15:06:26 +0100] rev 10393
add pylintrc with some mercurial specific configuration
Mon, 08 Feb 2010 14:52:28 +0100 localrepo: cleanup branch tip computation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Feb 2010 14:52:28 +0100] rev 10392
localrepo: cleanup branch tip computation
Mon, 08 Feb 2010 06:24:34 -0600 hgrc.5: Fix a typo
Steve Borho <steve@borho.org> [Mon, 08 Feb 2010 06:24:34 -0600] rev 10391
hgrc.5: Fix a typo
(0) -10000 -3000 -1000 -300 -100 -30 -10 -8 +8 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip