On 8/21/06, Justin Erenkrantz <justin@erenkrantz.com> wrote:
> On 8/21/06, Blair Zajac <blair@orcaware.com> wrote:
> > It appears that the svnmerge.py script wasn't used to do the merge, as the email
> > isn't showing a property diff on the branches/1.4.x directory.
> >
> > I know it's a small merge, but can we either fix the merge information in the
> > property on branches/1.4.x or revert the merge by hand and then redo the merge
> > with svnmerge.py?
> >
> > This is really more to get in the habit of using svnmerge.py :)
>
> I'm sorry, but I'm not going to use svnmerge.py anytime soon.
> Firstly, I don't have the python bindings installed as I don't have a
> recent enough SWIG for Subversion's liking. Secondly, there are no
> instructions in HACKING on how to use it that I can find.
FWIW, svnmerge.py doesn't actually use the python bindings, it just
calls the command line utilities.
> IMHO, svnmerge.py should cope gracefully when people can't use it.
> That's a critical requirement for any 'merge tracking' tool even when
> we roll it out with 1.5: we're not going to be able to force everyone
> to update their client to use these new features. -- justin
It does cope reasonably gracefully, the revision will be listed as
available for merge, and you'll get a conflict if you actually try to
merge it (no surprise there), and there are commands you can run to
tell svnmerge.py to simply record the merge in the properties, but not
actually do the merge (since you've already done it). Something like:
svnmerge.py merge -rWHATEVERREV --record-only
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Aug 21 19:05:56 2006