Mercurial > public > mercurial-scm > hg

diff tests/test-mq-git.out @ 10397:8cb81d75730c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Steve Losh <steve@stevelosh.com>
date Sun, 07 Feb 2010 10:47:54 -0500
parents 9c2c94934f0d
children f2618cacb485
line wrap: on
line diff
--- a/tests/test-mq-git.out	Mon Feb 08 19:44:04 2010 +0100
+++ b/tests/test-mq-git.out	Sun Feb 07 10:47:54 2010 -0500
@@ -1,5 +1,6 @@
 % git=auto: regular patch creation
 # HG changeset patch
+# Parent 0000000000000000000000000000000000000000
 # Date 0 0
 
 diff -r 000000000000 -r ef8dafc9fa4c a
@@ -9,6 +10,7 @@
 +a
 % git=auto: git patch creation with copy
 # HG changeset patch
+# Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4
 # Date 0 0
 
 diff --git a/a b/b
@@ -16,6 +18,7 @@
 copy to b
 % git=auto: git patch when using --git
 # HG changeset patch
+# Parent 2962f232b49d41ebc26c591ec8d556724be213ab
 # Date 0 0
 
 diff --git a/regular b/regular
@@ -26,6 +29,7 @@
 +regular
 % git=auto: regular patch after qrefresh without --git
 # HG changeset patch
+# Parent 2962f232b49d41ebc26c591ec8d556724be213ab
 # Date 0 0
 
 diff -r 2962f232b49d regular
@@ -35,6 +39,7 @@
 +regular
 % git=keep: git patch with --git
 # HG changeset patch
+# Parent 0000000000000000000000000000000000000000
 # Date 0 0
 
 diff --git a/a b/a
@@ -45,6 +50,7 @@
 +a
 % git=keep: git patch after qrefresh without --git
 # HG changeset patch
+# Parent 0000000000000000000000000000000000000000
 # Date 0 0
 
 diff --git a/a b/a
@@ -56,6 +62,7 @@
 +a
 % git=yes: git patch
 # HG changeset patch
+# Parent 0000000000000000000000000000000000000000
 # Date 0 0
 
 diff --git a/a b/a
@@ -66,6 +73,7 @@
 +a
 % git=yes: git patch after qrefresh
 # HG changeset patch
+# Parent 0000000000000000000000000000000000000000
 # Date 0 0
 
 diff --git a/a b/a
@@ -77,6 +85,7 @@
 +a
 % git=no: regular patch with copy
 # HG changeset patch
+# Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4
 # Date 0 0
 
 diff -r ef8dafc9fa4c -r 110cde11d262 b
@@ -86,6 +95,7 @@
 +a
 % git=no: regular patch after qrefresh with copy
 # HG changeset patch
+# Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4
 # Date 0 0
 
 diff -r ef8dafc9fa4c b