Re: [PATCH] r10788 and friends with resolved conflicts

On Mon, 11 Oct 2004, Ben Reser wrote:

> On Mon, Oct 11, 2004 at 06:45:47PM -0500, kfogel@collab.net wrote:
> > I thought we were going to use a directory named STATUS_PATCHES/ in
> > the release branch to hold these, or something like that? Does anyone
> > remember what we decided?
> >
> We didn't make a final decision. Justin suggested we just make branches
> for this purpose. We also had discussed making STATUS a dir instead of
> a file with the STATUS file as a child in there and then patches
> within...
>
>
I'd like us to use temporary branches for this. I'll change HACKING to
this effect if no one objects. I propose something like
branches/1.1.x-r10788. The revision is the first in the group.

Using a branch makes it easy to add more fixes to the fix if necessary.

Comments?
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 14 00:10:39 2004