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

Re: [PATCH] r10788 and friends with resolved conflicts

From: Ben Reser <ben_at_reser.org>
Date: 2004-10-12 04:21:03 CEST

On Mon, Oct 11, 2004 at 06:45:47PM -0500, kfogel@collab.net wrote:
> "Peter N. Lundblad" <peter@famlundblad.se> writes:
> > r10788 and friends (the UTF8 conversion perf regression fix) results in
> > conflicts when merged. I've created a patch with the conflicts resolved if
> > anyone would like to vote on it.
> >
> > Thanks to bliss for pointing out this to me.
>
> 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?
>
> I looked in HACKING, but didn't see anything about it. (Maybe that
> means I/we forgot to record the decision there!)

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...

-- 
Ben Reser <ben@reser.org>
http://ben.reser.org
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 12 04:21:10 2004

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