Skip to contentSkip to conversation

xentop-manpage: note about --delay

PATCH New Matthias Goergens 3 participants 5 messages Dec 17, 2010 – Dec 20, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xentop-manpage: note about --delay

Hi,

I added a note to the xentop manpage, explaining that --delay only takes integers.

I am using `hg email' to prepare the email, and I've botched up the first commit, but I've already pushed that pre-maturely. So I am sending both as separate patches. The second patch rectifies two problems with the first patch (typo and wrong position in series file). I hope that's not too confusing.

Cheers,
Matthias.

 series               |   1 +
 xentop-manpage-delay |  19 +++++++++++++++++++
 series               |   3 ++-
 xentop-manpage-delay |   2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)
#1 lore raw

PATCH 1/1 xentop manpage: --delay

 series               |   1 +
 xentop-manpage-delay |  19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)

# HG changeset patch
# User Matthias Goergens <[email protected]> # Date 1292590039 0
# Node ID 01ea26d2420e3562eb30e4f01db08667ad0bfd78 # Parent dff80e66bdf4ba050dfe014f1b7a9c9e503f7361 xentop manpage: --delay

series +1 -0
@@ -280,6 +280,7 @@ mtc-lockstep-framework
 
 # Temporary debugging patches
 CA-37981-debug
+xentop-manpage-delay
 
 #
 # EOF
xentop-manpage-delay new file +20 -0
new file mode 100644
@@ -0,0 +1,20 @@
+xentop manpage: Domain of --delay
+
+Add a note that --delay / -d silently truncates.
+
+Signed-off-by: Matthias Goergnes <[email protected]>
+
+# HG changeset patch
+# Parent e44c20d692a0e1ec4c299c0fe3893473360389ae
+diff --git a/tools/xenstat/xentop/xentop.1 b/tools/xenstat/xentop/xentop.1
+--- a/tools/xenstat/xentop/xentop.1
++++ b/tools/xenstat/xentop/xentop.1
+@@ -42,7 +42,7 @@ display help and exit
+ output version information and exit
+ .TP
+ \fB\-d\fR, \fB\-\-delay\fR=\fISECONDS\fR
+-seconds between updates (default 3)
++seconds between updates (default 3), silently truncates to an integral number
+ .TP
+ \fB\-n\fR, \fB\-\-networks\fR
+ output network information

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#2 lore raw

Re: [PATCH 1 of 2] xentop manpage: --delay

Matthias,

This looks like a diff of a patchqueue repository, not the diff itself. What exactly is this meant to apply to?

Patches sent to the list should be able to be applied directly to xen-unstable. The way I do this is as follows:
* Start with a clean copy of xen-unstable.hg
* Make a patch series as a mercurial patchqueue
* Once development of the series is done, pop them all off the queue and edit the patches to include short description in the first line, longer description (if necessary) following, then the signed-off-by line
* Push the queue back on
* Now if you do "hg outgoing" (in xen-unstable.hg), you should see your patch series as individual commits
* "hg email -o --plain" will mail the patch series correctly.

Hope that helps.

-George

Quoted 12 lines · Matthias Goergens

 series               |   1 +
 xentop-manpage-delay |  19 +++++++++++++++++++

 2 files changed, 20 insertions(+), 0 deletions(-)

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#3 lore raw

Re: [PATCH 1 of 2] xentop manpage: --delay

George Dunlap writes ("Re: [Xen-devel] [PATCH 1 of 2] xentop manpage: --delay"):

Quoted 5 lines

This looks like a diff of a patchqueue repository, not the diff itself. What exactly is this meant to apply to?

Patches sent to the list should be able to be applied directly to xen-unstable. The way I do this is as follows:

Matthias seems to be using git. I use git myself sometimes to prepare patches for xen-unstable. The way to do this is:

* Start with a clean git clone of a git conversion of xen-unstable.hg (which you can make with "hg-fast-export.sh" which is part of "fast-export")
* Create a branch for your patch or series
* Cherry pick or otherwise apply your changes to that branch
* Use git-rebase -i etc. to get the commit messages into shape
* Compile and test the resulting tree
* Use git-format-patch
* Use git-send-email --chain-reply-to --compose
(If you haven't used git-send-email before, get it to send the messages to yourself the first time round)

But anyway, diffs of diffs aren't the way to do it.

Thanks,
Ian.

#4 lore raw

PATCH 1/1 xentop-manpage: fix typo and move series entry to should-go-upstream section

In reply to Matthias Goergens
 series               |  3 ++-
 xentop-manpage-delay |  2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

# HG changeset patch
# User Matthias Goergens <[email protected]>
# Date 1292597981 0
# Node ID f38ca873a85883cc67ea8d1f0268b65bc0e3af3a
# Parent 01ea26d2420e3562eb30e4f01db08667ad0bfd78
xentop-manpage: fix typo and move series entry to should-go-upstream section

series +2 -1
@@ -106,6 +106,8 @@ CA-46184-fix-pirq-unbind.diff
 # New to-upstream patches since Tim's sweep
 ept-access-once.diff
 shadow-l3-bad-pointer
+xentop-manpage-delay
+
 
 #
 # Makefiles
@@ -280,7 +282,6 @@ mtc-lockstep-framework
 
 # Temporary debugging patches
 CA-37981-debug
-xentop-manpage-delay
 
 #
 # EOF
xentop-manpage-delay +1 -1
@@ -2,7 +2,7 @@ xentop manpage: Domain of --delay
 
 Add a note that --delay / -d silently truncates.
 
-Signed-off-by: Matthias Goergnes <[email protected]>
+Signed-off-by: Matthias Goergens <[email protected]>
 
 # HG changeset patch
 # Parent e44c20d692a0e1ec4c299c0fe3893473360389ae

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel