[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [egit-dev] Difference between Compare with HEAD and Index
|
onsdagen den 25 augusti 2010 15.24.20 skrev Lay, Stefan:
> > -----Original Message-----
> > From: Dariusz Luksza [mailto:dariusz.luksza@xxxxxxxxx]
> > Sent: Mittwoch, 25. August 2010 14:52
> > Actually I've plan to add support for displaying staged and unstaged
> > changes to change set in synchronization view. This is on my TODO list
> > next after bug fixing and mylyn integration.
> >
> > In my humble opinion we should have single place where user can review
> > changes that was made in repository and "prepare" commit.
>
> Maybe it is a good idea not to add another view. I'm however a bit
> skeptical if we can find a good way to bring the staging concept into the
> synchronize view. The synchronize API supposes a local state (L), a remote
> state (R) and a common base (B).
> L R
> \ /
> \ /
> B
>
> Staging supposes a different topology (Local, Stage, HEAD):
>
> L
> \
> S
> \
> H
>
> So we put a concept into the view which is not made for that.
>
Just thinking alound..... You can look at HEAD as the common version
with local and index as forks from HEAD. When you stage you pick
you changes from local over to the index. Nothing strange there is
it?
L S
\ /
H
-- robin
