Merging r9254

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.

---------------------------------------------------------------------
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:23:59 2004