On Sun, Nov 16, 2008 at 11:10:41PM +0100, Branko ??ibej wrote:
> Stefan Sperling wrote:
> > On Fri, Nov 14, 2008 at 01:43:24PM +0000, Stefan Sperling wrote:
> >
> >> Hi,
> >>
> >> I took the time to run the tree-conflict scripts I've created for my
> >> thesis (https://www.inf.fu-berlin.de/w/SE/ThesisTreeConflicts)
> >> against current Subversion trunk (r34187).
> >>
> >> These scripts provoke many different tree conflicts scenarios.
> >> For the thesis I ran them with Subversion 1.5, and not a single
> >> tree conflict was detected.
> >>
> >
> > Same story (i.e. tree conflict *detection* only) for directories,
> > using trunk build from r34234.
> >
>
> What I'd really like to know: Is detection without resolution useful in
> real life?
You're in the wrong thread.
This one is only here to highlight our success in detection which
is still important in its own right, even though resolution may
still suck.
See here:
http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=145390
And here:
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=145339
> What can the user do if SVN detects the conflict but she
> can't resolve it?
You can help us find out, e.g. by walking through a few scenarios :)
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-16 23:20:07 CET