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, Nik Clayton wrote:

> David Glasser wrote:
> >On 1/17/07, John Peacock <jpeacock@rowman.com> wrote:
> >>> I think it might be better to push to the repository with svk's
> >>> --verbatim to avoid this line in the log messages.
> >>
> >>Agreed. That was my first "push" to the repository, so I'll know better
> >>next time. Do you think it is worthwhile revising the log entry?
> >
> >Yeah, probably should. (I think clkao and I have gone the "log
> >messages must look like everybody else's, but svk:merge tickets are OK
> >to push" route.)
>
> That brings up something I was going to ask.
>
> 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.

We've started using svnmerge.py for merges from trunk to feature and
release branches.

This is not described in HACKING, but should be.

After the 1.5.0 release, we'll have basic Merge Tracking support in
Subversion, and will start using that.

- Dan