Hi, 

I'm experiencing difficulties (code loss, even) when trying to 
commit code using Iceberg. 

I have a project with consist of some Pharo code and some
C++ code. Both parts kind of depend on each other. 

Imagine I start from commit A

--- A

and build and open Pharo image. Then I do some work in
Pharo and commit, leaving me at B:

--- A --- B

Now I need to make some changes to the C++ code, say C & D:

--- A --- B --- C --- D

And work little more on C++ but do not commit (therefore I have
modified C++ files and/or staged changes). Now imagine I need to
do more changes in Pharo image and commit (should be commit E)

Now there's the problem. Pharo image thinks it is still at commit B
and starts complaining about image being out if sync. 

What is the correct workflow to end up with:

--- A --- B --- C --- D --- E

!!! AND !!! with my local modifications to C++ code preserved
in working copy? I'd be nice to preserve staged changes too,
but I'd be OK to unstage all changes if necessary.

Any suggestions? 

Best, Jan


Reply via email to