[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r20745 - branches/1.4.x

From: Kouhei Sutou <kou_at_cozmixng.org>
Date: 2006-07-20 13:52:04 CEST

Hi,

In <7edfeeef0607191053v181eabafv97392afd5c68ef44@mail.gmail.com>
  "Re: svn commit: r20745 - branches/1.4.x" on Wed, 19 Jul 2006 10:53:03 -0700,
  "Garrett Rooney" <rooneg@electricjellyfish.net> wrote:

> On 7/19/06, Blair Zajac <blair@orcaware.com> wrote:
>
> > The way we commonly do merges for backports from trunk into a release branch is
> > to branch from the 1.x.y branch and then merge the revision in from trunk, then
> > in a separate commit, make any fixes for it to work on the branch. Then the
> > STATUS file contains only revisions to merge from the newly created branch.
> >
> > Also, you might want to change the message to indicate that the segmentation
> > fault is in the Ruby bindings, otherwise, somebody needs to look up the log
> > message for the revisions.
>
> Agreed on both counts. For this case I figured out what was intended
> and was able to merge it, but in the future following the usual
> procedure would be much preferred.

I see. I will mind the two points.
I'm sorry.

Regards,

--
kou
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 20 13:52:36 2006

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