Hi,
I've always found it strange that I was required to target a subversion
working copy when executing an svnmerge avail. I felt it would be
intuitive to allow either a path to a working copy, or the URL location
of branch.
To that end, I had a quick peek at the code, and determined that this
simple patch would be sufficient for allowing URL targets to the avail
command.
I hope that you will consider it for inclusion.
Regards,
Shaddy
[[[
* svnmerge.py
(main): allow the use of the avail command against a URL instead of
the current rigid requirement that a subversion working copy be
referenced.
Patch by: Shaddy Baddah <[EMAIL PROTECTED]>
]]]
Index: svnmerge.py
===================================================================
--- svnmerge.py (revision 31760)
+++ svnmerge.py (working copy)
@@ -2085,7 +2085,17 @@
# Validate branch_dir
if not is_wc(branch_dir):
- error('"%s" is not a subversion working directory' % branch_dir)
+ print str(cmd)
+ if str(cmd) == "avail":
+ info = None
+ try:
+ info = get_svninfo(branch_dir)
+ except LaunchError:
+ pass
+ if (info is None) or (info == {}):
+ error('"%s" is neither a valid URL, nor a working directory' % branch_dir)
+ else:
+ error('"%s" is not a subversion working directory' % branch_dir)
# Extract the integration info for the branch_dir
branch_props = get_merge_props(branch_dir)
_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge
