Stefan Sperling <stsp_at_elego.de> wrote on 04/20/2008 02:27:40 PM:
> On Sun, Apr 20, 2008 at 11:54:12AM +0200, Nico Schellingerhout wrote:
> > Come to think of it, wouldn't it be more consistent to load the WC
> > with the usual helper files, and extend that to tree conflicts and
> > dirs?
> > From the Subversion book:
> > > sandwich.txt
> > > sandwich.txt.mine
> > > sandwich.txt.r1
> > > sandwich.txt.r2
> > for update/switch and
> > > filename.working
> > > filename.left
> > > filename.right
> > for merge.
> >
> > That would lead to the following behavior table:
> >
> > target \ source | mod add del rep
> > ----------------+-----------------
> > mod | M X Ca Cb
> > add | X Cc X X
> > del | Cd X Ce Cd
> > rep | Cb X Ca Cb
> >
> > Legend:
> > Ca: filename.working + filename.left
> > Cb: filename.working + filename.left + filename.right
> > Cc: filename.working + filename.right
> > Cd: filename.left + filename.right
> > Ce: filename.left
> >
> > Note that the only differences between the Ca-Ce behaviors is what
> > files are dropped in the WC. The decision on what files to drop is
> > based purely on the absence/presence of the path in the left, right,
> > and working version of the tree. This should make the implementation
> > easier I guess.
> >
> > The advantage of that approach is also that it should be pretty
clear to
> > the user, because IMHO it would be a consistent re-use of a
> known concept.
>
> Yes, we can do that. But I'd rather delay this to the second
> phase. Because frankly, the current state of how the user interfaces
> with tree conflicts is lacking beyond belief.
Fair enough. Just a thought to hold on to, and an attempt to simplify the
case analysis at the same time.
>
> So since we need to fix the UI anyway, I think we should focus on
> getting proper detection code in place for now, and not change
> the current UI (which is fine for testing).
Agreed.
>
> --
> Stefan Sperling <stsp_at_elego.de> Software Monkey
>
> German law requires the following banner :(
It does?
> elego Software Solutions GmbH HRB 77719
> Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96
> 13355 Berlin Fax: +49 30 23 45 86 95
> http://www.elego.de CEO: Olaf Wagner
>
> Store password unencrypted (yes/no)? No
- Nico
Received on 2008-04-20 14:53:35 CEST