Hi,
I'm quite surprised that this bug exists, and has existed for so long...
so I'm a little uncertain that I have uncovered a real problem.
In words, the problem is that I cannot specify the repository relative
pathid as the merge source value to the --source switch. The following
output describes the problem best:
$ python /tmp/svnmerge/svnmerge.py avail --bidirectional --log
svnmerge: multiple sources found. Explicit source argument (-S/--source)
required.
The merge sources available are:
/release-2
/release-1
$ python /tmp/svnmerge/svnmerge.py avail --bidirectional --log --source
/release-1
svnmerge: "/release-1" is neither a valid URL, nor an unambiguous
substring of a repository path, nor a working directory
Actually, I have done a search, and a poster had already intimated that
this problem existed
(http://www.orcaware.com/pipermail/svnmerge/2006-May/000599.html), and
proposed the same solution I have implemented by the attached patch.
I hope you will consider it for inclusion.
Regards,
Shaddy
[[[
* svnmerge.py
(main): fix selection of merge source as a repository relative pathid
Patch by: Shaddy Baddah <[EMAIL PROTECTED]>
]]]
Index: svnmerge.py
===================================================================
--- svnmerge.py (revision 31771)
+++ svnmerge.py (working copy)
@@ -2120,7 +2120,7 @@
# within the branch properties.
found = []
for pathid in branch_props.keys():
- if pathid.find(source) > 0:
+ if pathid.find(source) >= 0:
found.append(pathid)
if len(found) == 1:
# (assumes pathid is a repository-relative-path)
_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge
