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

Hi,

In <124C25BB-B647-4886-9CD6-161FE980A5B5@orcaware.com>
  "Re: svn commit: r21796 - in branches/1.4.x: . subversion/bindings/swig" on Fri, 6 Oct 2006 09:25:05 -0700,
  Blair Zajac <blair@orcaware.com> wrote:

>
> 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?

I'm sorry. I didn't use the 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

I reverted this merge (r21796) and re-merged with
svnmerge.py in r21824. So I didn't use 'svn commmit -F
svnmerge-commit-message.txt'.

Thanks for pointing out my mistake.

Regards,

--
kou
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org