> -----Original Message-----
> From: C. Michael Pilato [mailto:cmpilato_at_collab.net]
> Sent: maandag 25 juni 2012 17:02
> To: Subversion Development
> Subject: Re: Trunk regression? ('svn update *')
>
> On 06/25/2012 10:44 AM, C. Michael Pilato wrote:
> > On 06/25/2012 10:12 AM, Stefan Sperling wrote:
> >> On Mon, Jun 25, 2012 at 09:57:52AM -0400, C. Michael Pilato wrote:
> >>> On 06/25/2012 09:42 AM, Stefan Sperling wrote:
> >>>> It's a silly bug I introduced where the new codes tries to resolve
> conflicts
> >>>> in an unversioned directory, the parent of all update targets in your
> case.
> >>>> Should be fixed as of r1353532.
> >>>
> >>> Sweet. I was hoping it was something that simple. Thanks, Stefan.
> >>
> >> My hastily committed fix had a pool handling bug though :(
> >> See r1353562. Should be fine now.
> >
> > It also still fails when there are unversioned targets, which pre-Berlin
> > gracefully "Skip"ped. :-(
>
> r1353587. I think this gets us back to where we were.
I'm not sure if it really brings us back where we were.
svn up --accept=theirs .
would have resolved the incoming conflicts on updates as theirs, while it currently resolves all nodes (including those not touched by the update) below '.' to theirs.
(I'm not sure if this is really the behavior that we want here)
Bert
Received on 2012-06-25 17:25:49 CEST