Re: svn commit: r21796 - in branches/1.4.x: . subversion/bindings/swig

On Oct 5, 2006, at 11:33 PM, kou@tigris.org wrote:

> Author: kou
> Date: Thu Oct 5 23:33:21 2006
> New Revision: 21796
>
> Log:
> Merge r21793 from trunk into the 1.4.x branch.
>
> Ruby: Accept nil for Svn::Repos#load_fs's parent_dir argument.
>
> Votes:
> +1: kou, blair
>
>
>
> Modified:
> branches/1.4.x/STATUS
> branches/1.4.x/subversion/bindings/swig/svn_repos.i

Kou,

Did you use the svnmerge.py to do the merge? It doesn't look like
it, since there's no property change on the 1.4.x directory?

The STATUS file has this at the top:

NOTE: This branch uses svnmerge.py for merge tracking. Please
familiarize
yourself with that tool if you plan to actually merge changes here.

And there's more information on how to use it at:

http://www.orcaware.com/svn/wiki/Svnmerge.py

In this case, I think you want to run these commands in the branch:

$ svnmerge.py merge -r 21793 --record-only
$ svn commmit -F svnmerge-commit-message.txt

Regards,
Blair

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 6 18:25:29 2006