On Fri, 2009-12-04, Daniel Näslund wrote:
> Hi Julian & Stefan!
>
> Some comments inline. A new classfication at the end and some initial
> thoughts about API changes. Early I know but I want to code, doing all
> this thinking is boring :-).
>
> Is it possible to just do resolution for files as a
Hi Julian & Stefan!
Some comments inline. A new classfication at the end and some initial
thoughts about API changes. Early I know but I want to code, doing all
this thinking is boring :-).
Is it possible to just do resolution for files as a first stage? I mean
both spec and implementation.
On W
On Wed, Dec 02, 2009 at 12:57:31PM +, Julian Foad wrote:
> > > 1. Locale add, incoming add
[...]
> > > - I was doing roughly the same thing but the item is a bit different.
> > > -> merge the two items -> manual 2-way merge (or 3-way if both are
> > > w/hist and it's the same copy-f
Stefan Sperling wrote:
> On Wed, Dec 02, 2009 at 08:53:00AM +0100, Daniel Näslund wrote:
> > Intro
> > ==
> > This thread was basically about me trying to convince myself that
> > the approach in notes/tree-conflicts/resolution.txt holds. Here's an
> > attempt to describe the state the WC is in
On Wed, Dec 02, 2009 at 08:53:00AM +0100, Daniel Näslund wrote:
> [[[
> * When "svn update" or "svn switch" raises a tree conflict, it shall update
> the victim's "base" version from OLD to THEIRS, and leave the "working"
> version in a state that would be committable (but for the explicit chec
On Thu, Nov 26, 2009 at 08:01:30PM +0100, Daniel Näslund wrote:
> What I want to do
> =
> I'm trying to sort out the different tree conflict scenarios for a
> possible tree conflict resolver as described in #3144 [1].
>
> As a first step I'm looking at conflicts on files when
On Mon, Nov 30, 2009 at 12:42:29PM +0100, Stefan Sperling wrote:
> On Thu, Nov 26, 2009 at 08:01:30PM +0100, Daniel Näslund wrote:
> > cp-add
> > -
> > alpha has been locally copied to eta, incoming add eta
> > Options:
> > THEIRS:1) svn revert eta
> > 2) rm eta
> >
On Mon, Nov 30, 2009 at 12:25:15PM +0100, Johan Corveleyn wrote:
> I've quickly read through your analysis (I'm interested in seeing tree
> conflict handling being improved). I'm not sure if I have to interpret
> the svn commands you give in the different use cases as commands that
> should curren
On Thu, Nov 26, 2009 at 08:01:30PM +0100, Daniel Näslund wrote:
> cp-add
> -
> alpha has been locally copied to eta, incoming add eta
> Options:
> THEIRS:1) svn revert eta
> 2) rm eta
> 3) svn up eta
It would help to change the wording of the spec to be more precise
Hi,
I've quickly read through your analysis (I'm interested in seeing tree
conflict handling being improved). I'm not sure if I have to interpret
the svn commands you give in the different use cases as commands that
should currently work (and resolve the tree conflicts). But if so,
I've got some r
Daniel Näslund wrote:
> I'm trying to sort out the different tree conflict scenarios for a
> possible tree conflict resolver as described in #3144 [1].
Thanks for this. This is just to let you know I see your email, but I
won't get around to digesting it and replying today.
- Julian
Hi!
What I want to do
=
I'm trying to sort out the different tree conflict scenarios for a
possible tree conflict resolver as described in #3144 [1].
As a first step I'm looking at conflicts on files when using update. I
have attached a script for testing. Run './utc.sh list
12 matches
Mail list logo
