[[[
Add check for already initialized head.
* contrib/client-side/svnmerge.py
(action_init): Modified to print error message and exit,
when the branch provided has already been initialized for
the given head.
]]]
Index: contrib/client-side/svnmerge.py
===================================================================
--- contrib/client-side/svnmerge.py (revision 19182)
+++ contrib/client-side/svnmerge.py (working copy)
@@ -935,6 +935,13 @@
(branch_dir, revs, opts["head-url"]))
revs = str(revs)
+ # if the head-path already has an entry
+ # in the svnmerge-integrated property,
+ # simply error out.
+ if branch_props.has_key(opts["head-path"]):
+ err_msg = opts["head-path"] + " has already been initialized at "
+ err_msg += branch_dir
+ error(err_msg)
branch_props[opts["head-path"]] = revs
# Set property
Add check for already initialized head.
* contrib/client-side/svnmerge.py (action_init): Modified to print error message and exit, when the branch provided has already been initialized for the given head.
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
