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

Re: svn commit: r35809 - branches/1.5.x

From: Senthil Kumaran S <senthil_at_collab.net>
Date: Thu, 12 Feb 2009 16:16:55 +0530

Hi Hyrum,

Hyrum K. Wright wrote:
> But I still don't have an answer to my initial question: did anybody
> bother actually doing the merge before voting +1 on this change?

No I didn't try merging this before voting. I just reviewed these changes. Just
now had a look at hacking and found the following:

Before proposing a change in STATUS, you should try merging it onto the branch
to ensure that it doesn't produce merge conflicts. If conflicts occur, please
create a new temporary branch from the release branch with your changes merged
and the conflicts resolved. The branch should be named A.B.x-rYYYY, where YYYY
is the first revision of your change in the STATUS file. Add a note in the
STATUS file about the existence of the temporary branch. If the change involves
further work, you can merge those revisions to the branch. When the entry for
this change is removed from STATUS, this temporary branch should also be
removed to avoid cluttering the /branches directory.

I was not aware of the above, all these days. In future I ll follow it up.

Thank You.

Senthil Kumaran S
Received on 2009-02-12 21:00:33 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.