Re: Merging to/from branches (was Re: svn commit: r23056 - in branches/perl-bindings-improvements: . subversion/bindings/swig/perl/native)

On Thu, 18 Jan 2007, John Peacock wrote:

> Nik Clayton wrote:
> > Is that likely for this branch? I'm envisaging that we'll be doing
> > cleanups and new work that can be merged in discrete lumps into trunk/.
> > So the branch might be quite long lived, with repeated merges back to
> > trunk/.
>
> If Nik and I want to use SVK for the repeated merges from trunk to branch, then
> we can just as simply use SVK to provide the merge to trunk in the form of a
> diff file for Daniel to commit. Alternatively, if he is willing to just read
> the diff and give his blessing, as partial committers we can commit to the trunk
> with his ID on the "Approved by" line.
>
> I'm also OK with using svnmerge.py for all interactions with the trunk code.
> It's really up to you Daniel...

I don't have any problem with using svk to merge to trunk. There's
already some svk meta data in subversion's repository, so there's
precedent for this.