[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: Daniel Rall <dlr_at_collab.net>
Date: 2007-01-17 23:59:46 CET

On Wed, 17 Jan 2007, Nik Clayton wrote:

> John Peacock wrote:
> >Nik Clayton wrote:
> >>What's the approved way to merge from trunk to a branch? I looked
> >>through hacking.html and didn't see anything in there about it. I
> >>assume the project has standards for that sort of thing.
> >
> >Since I'm using SVK, I was planning on letting SVK handle it for me.
> >Actually, since I have a local branch where I'm actually working, I'd
> >have to smerge from trunk to branch, then 'up -sm' to my local branch.
>
> Is this going to cause us problems in the future when we want to merge
> from the branch back to the trunk?
>
> 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).

So no, use of SVK for keeping your branch up to date with trunk
shouldn't cause any problems down the road.

- Dan

  • application/pgp-signature attachment: stored
Received on Thu Jan 18 00:00:00 2007

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