[Pharo-users] Loading Local Repositories with Iceberg
guillermopolito at gmail.com
Tue Jun 5 04:13:07 EDT 2018
On Tue, Jun 5, 2018 at 8:20 AM, Norbert Hartl <norbert at hartl.name> wrote:
> > Am 04.06.2018 um 15:59 schrieb Esteban Lorenzano <estebanlm at gmail.com>:
> > hi,
> >> On 4 Jun 2018, at 12:57, Stephan Eggermont <stephan at stack.nl> wrote:
> >> Evan Donahue <emdonahu at gmail.com> wrote:
> >>> I have "Share repositories between images" checked in both images,
> >> Share repositories at the moment just provides a shared location on disk
> >> where the repositories are located. That is only useful if you are very
> >> disciplined about stashing and switching to the branch needed for your
> >> current image, and you only have one image open at a time.
> > not really.
> > P7 will force you to be in the right branch or you will not be able to
> do… almost anything :)
> > you can have two (or ten) images opened at once and work on them, but at
> a moment you will need to “repair” each image to commit.
> How does this work if the other image has updated the git index?
Iceberg ignores completely git's index (until the moment you commit).
I cannot tell it 100% sure but It probably depends on the particular
scenario you're on but IIRC:
- if you checkout with iceberg, it will most surely discard your index;
- if you try to commit with iceberg and you have a dirty index, iceberg
will commit coming from your image along with the thing in the index
> Repairing will update&merge, too?
What the merge operation does depends on the kind of merge:
- a fast forward will just checkout the new commit in disk, probably
discarding your index
- a non fast forward will leave the disk as is, without touching the index
(until you resolve the conflicts and then Iceberg will commit, which should
do what I explained above)
> That is usually the reason I commit always first so I commit to a prior
> version of the index in order to have git merge on update.
Yes, I'd recommend people to try to have a clean working copy when using
iceberg, and specially a clean index.
> > Esteban
> >> Stephan
Centre de Recherche en Informatique, Signal et Automatique de Lille
CRIStAL - UMR 9189
French National Center for Scientific Research - *http://www.cnrs.fr
*Web:* *http://guillep.github.io* <http://guillep.github.io>
*Phone: *+33 06 52 70 66 13
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Pharo-users