Mon, 08 Feb 2010 23:47:23 +0100 test-branch-option: make it executable
Patrick Mezard <pmezard@gmail.com> [Mon, 08 Feb 2010 23:47:23 +0100] rev 10399
test-branch-option: make it executable
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.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip