[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: Nik Clayton <nik_at_ngo.org.uk>
Date: 2007-01-18 22:47:05 CET

Daniel Rall wrote:
> On Wed, 17 Jan 2007, Nik Clayton wrote:
>> I'm using SVK too, and it's great. But I'm wary of getting in to a
>> situation where we've made a bunch of merges with SVK and then start
>> needing to use svnmerge.py to merge things back.
>
> As far as Subversion's own development goes, we've only been using
> svnmerge.py for one-way synchronization (trunk -> branch). Merges
> back into trunk have been via vanilla 'svn merge', since such a merge
> has typically meant that the branch is at EOL and will be deleted
> after the merge, so there's no reason to retain merge info for the
> branch (since no subsequent merges with it as a merge source will
> occur).

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

N

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jan 19 00:31:13 2007

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