[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-17 22:52:58 CET

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.

N

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jan 17 22:53:22 2007

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