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

On Wed, 17 Jan 2007, 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.

FWIW, I personally have nothing against y'all using svk instead of
svnmerge.py. While svnmerge.py is light-weight and has consensus as
our "standard" for the time being, it certainly isn't the only tool
capable of handling the job. You and Nik are likely to be the only
ones doing merges into the branch; it doesn't make sense to me to get
in the way of your preferred tool set.