git workflow (iceberg) and monticello packages

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

git workflow (iceberg) and monticello packages

Nicolai Hess-3-2
Hi ,

I am still not sure I understand the git based development workflow.

I set up my image and repository as described by the guide.

now, if new commits are in the pharo-project, iceberg shows the list of incoming
changes (commits). Ok, but:

If I modify code in my image (for example, change a method in class Morph),
the morphic-core package is marked as dirty in monticello and my
pharo repository in iceberg is marked with an asterisk.
If I choose "synchronize repository ..." I would expect my change to be an
uncommited change, but instead, it isn't shown and the Morphic-core package
isn't dirty anymore.

Is it because I need to create a branch first ? But why is the Morphic-core package
not dirty anymore, the change is not commited or published, how do I know
where are my changes ?

nicolai
Reply | Threaded
Open this post in threaded view
|

Re: git workflow (iceberg) and monticello packages

Guillermo Polito


On Sun, Feb 4, 2018 at 11:07 PM, Nicolai Hess <[hidden email]> wrote:
Hi ,

I am still not sure I understand the git based development workflow.

I set up my image and repository as described by the guide.

now, if new commits are in the pharo-project, iceberg shows the list of incoming
changes (commits). Ok, but:

If I modify code in my image (for example, change a method in class Morph),
the morphic-core package is marked as dirty in monticello and my
pharo repository in iceberg is marked with an asterisk.
If I choose "synchronize repository ..." I would expect my change to be an
uncommited change, but instead, it isn't shown and the Morphic-core package
isn't dirty anymore.

Is it because I need to create a branch first ? But why is the Morphic-core package
not dirty anymore, the change is not commited or published, how do I know
where are my changes ?

No, that's a bug between the iceberg-monticello interaction. Iceberg does not manage himself the detection of modified/dirty packages, he relies for that on monticello.
And it happens from time to time that
 - a package is marked as dirty and it is not
 - a package is marked as cleand and it is not

both cases are confusing. I don't know if this comes from a bad usage of the monticello API or something else...
 


nicolai



--

   

Guille Polito

Research Engineer

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

Phone: +33 06 52 70 66 13