[PATCH] in/out --summary [was Re: Mozilla: hg as a collaboration tool]
Jesse Glick
Jesse.Glick at Sun.COM
Tue Feb 12 17:59:15 CST 2008
Alexis S. L. Carvalho wrote:
>> There ought to be a command (out --summary?) which folds all
>> non-merge outgoing changesets and displays the result as a patch.
By the way see
http://www.selenic.com/mercurial/bts/issue28
and
http://www.selenic.com/mercurial/bts/issue219
> Maybe something like this?
It doesn't work for me; it folds in merge changesets too, making the
output misleading. E.g. in the following example I expected out -s to
show only the patch to r:
dev$ testhg out -p
comparing with /tmp/hgtest-synch/server/dev
searching for changes
changeset: 32:321def50b738
user: Jesse Glick <jesse.glick at sun.com>
date: Tue Feb 12 18:54:29 2008 -0500
summary: r
diff -r e4d334f03d11 -r 321def50b738 r
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/r Tue Feb 12 18:54:29 2008 -0500
@@ -0,0 +1,1 @@
+r
changeset: 38:1985546796ed
tag: tip
parent: 32:321def50b738
parent: 37:a17294697ebf
user: Jesse Glick <jesse.glick at sun.com>
date: Tue Feb 12 18:54:31 2008 -0500
summary: Automated merge with file:/tmp/hgtest-synch/server/dev
diff -r 321def50b738 -r 1985546796ed m
--- a/m Tue Feb 12 18:54:29 2008 -0500
+++ b/m Tue Feb 12 18:54:31 2008 -0500
@@ -1,1 +1,1 @@
-m
+mmm mmm
diff -r 321def50b738 -r 1985546796ed n
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/n Tue Feb 12 18:54:31 2008 -0500
@@ -0,0 +1,1 @@
+n
diff -r 321def50b738 -r 1985546796ed q
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/q Tue Feb 12 18:54:31 2008 -0500
@@ -0,0 +1,1 @@
+q
dev$ testhg out -s
comparing with /tmp/hgtest-synch/server/dev
searching for changes
diff -r e4d334f03d11 -r 1985546796ed m
--- a/m Tue Feb 12 15:01:08 2008 -0500
+++ b/m Tue Feb 12 18:54:31 2008 -0500
@@ -1,1 +1,1 @@
-m
+mmm mmm
diff -r e4d334f03d11 -r 1985546796ed n
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/n Tue Feb 12 18:54:31 2008 -0500
@@ -0,0 +1,1 @@
+n
diff -r e4d334f03d11 -r 1985546796ed q
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/q Tue Feb 12 18:54:31 2008 -0500
@@ -0,0 +1,1 @@
+q
diff -r e4d334f03d11 -r 1985546796ed r
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/r Tue Feb 12 18:54:31 2008 -0500
@@ -0,0 +1,1 @@
+r
dev$
--
jesse.glick at sun.com netbeans.org ant.apache.org hudson.dev.java.net
selenic.com/mercurial http://google.com/search?q=e%5E%28pi*i%29%2B1
More information about the Mercurial-devel
mailing list