[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-17 19:36:12 CET

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.


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

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