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

Re: Merging r9254

From: Ben Reser <ben_at_reser.org>
Date: 2004-04-16 20:29:25 CEST

On Fri, Apr 16, 2004 at 01:22:02PM -0500, Ben Collins-Sussman wrote:
> We're starting to get to the point where a lot of backported changes
> don't apply cleanly to the 1.0.x branch anymore. In IRC, breser and I
> were thinking that maybe it's time to start voting on backported
> patches, rather than revnums.
> For example, I'd really like to get this into 1.0.2 (because we have
> other similar changes in 1.0.2 already), but I've not been following the
> 'shared wc' thread carefully. I get a conflict when merging this teensy
> change:
> * r9254
> Fix for updates to svn:executable files in shared working copies.
> Justification: Hard to use svn:executable in shared working copies
> without it.
> Votes:
> +1: philip, dlr, breser
> Philip, can you try doing the merge? You're qualified to understand the
> conflict, and I'm not.

I can do this merge. Philip has said already he's not interested in
r9254. So I'll deal with this conflict.

Ben Reser <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 Fri Apr 16 20:29:43 2004

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.