[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: John Peacock <jpeacock_at_rowman.com>
Date: 2007-01-19 01:37:14 CET

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

John

-- 
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Blvd
Suite H
Lanham, MD 20706
301-459-3366 x.5010
fax 301-429-5747
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jan 19 01:41:00 2007

This is an archived mail posted to the Subversion Dev mailing list.