You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Peter N. Lundblad" <pe...@famlundblad.se> on 2004/10/11 22:10:04 UTC
[PATCH] r10788 and friends with resolved conflicts
Hi,
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.
Regards,
//Peter
Re: [PATCH] r10788 and friends with resolved conflicts
Posted by kf...@collab.net.
"Peter N. Lundblad" <pe...@famlundblad.se> writes:
> 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.
I like it. You'll probably get 10 different responses from 10
different people with 12 different opinions... But I like it :-).
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] r10788 and friends with resolved conflicts
Posted by "Peter N. Lundblad" <pe...@famlundblad.se>.
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
Re: [PATCH] r10788 and friends with resolved conflicts
Posted by Ben Reser <be...@reser.org>.
On Mon, Oct 11, 2004 at 06:45:47PM -0500, kfogel@collab.net wrote:
> "Peter N. Lundblad" <pe...@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 <be...@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
Re: [PATCH] r10788 and friends with resolved conflicts
Posted by kf...@collab.net.
"Peter N. Lundblad" <pe...@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!)
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org