Fwd: [PATCH][svnmerge] Fix reporting message for 'avail --blocked'

A gentle reminder to svnmerge committers about this patch....

------- Forwarded message -------
From: "Madan U Sreenivasan" <madan@collab.net>
To: "svnmerge@orcaware.com" <svnmerge@orcaware.com>,
"dev@subversion.tigris.org" <dev@subversion.tigris.org>
Cc:
Subject: [PATCH][svnmerge] Fix reporting message for 'avail --blocked'
Date: Tue, 18 Apr 2006 00:54:50 +0530

[[[
Fix verbose message for `avail --blocked'.

* contrib/client-side/svnmerge.py
    (action_avail): Modified to use a different report() message, when
    `svnmerge avail' is invoked with the `--blocked' option.
]]]

Fix verbose message for `avail --blocked'.

* contrib/client-side/svnmerge.py
  (action_avail): Modified to use a different report() message, when
  `svnmerge avail' is invoked with the `--blocked' option.

Index: contrib/client-side/svnmerge.py
===================================================================
--- contrib/client-side/svnmerge.py (revision 19394)
+++ contrib/client-side/svnmerge.py (working copy)
@@ -980,17 +980,20 @@
 
     # Compose the set of revisions to show
     revs = RevisionSet("")
+ report_msg = ""
     if "avail" in opts["avail-showwhat"]:
         revs |= avail_revs
+ report_msg = "revisions available to be merged are:"
     if "blocked" in opts["avail-showwhat"]:
         revs |= blocked_revs
+ report_msg = "revisions blocked are:"
 
     # Limit to revisions specified by -r (if any)
     if opts["revision"]:
         revs = revs & RevisionSet(opts["revision"])
 
     display_revisions(revs, opts["avail-display"],
- "revisions available to be merged are:",
+ report_msg,
                       opts["head-url"])
 
 def action_integrated(branch_dir, branch_props):

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org