Re: [anjuta-devel] New project interface and introspection

[Abderrahim KITOUNI <a kitouni gmail com>]

Hi all,

Le 26 octobre 2010 20:18, Sébastien Granjoux <seb sfo free fr> a écrit :
> Hi Johannes,
>
> Le 25/10/2010 22:16, Johannes Schmid a écrit :
> > > 1. Just merge the whole branch into master.
> >
> > Actually, I don't see a big issue here. The full history shouldn't have
> > any negative effect. You can clean it up though - see below.
>
> Ok, I will probably do this, it's the easiest option for me.
I think this is also the right thing to do. You have used a branch
workflow (merging often from master) so trying to do something else
will surely be painful.

> > > 2. Try to remove the useless commit.
> >
> > This will open an
> > editor with the last 50 commits where you can delete individual commits
> > by just deleting the line describing the commit.
>
> I have already tried on a few commits here. There are 118 commits in the
> newproject branch, it's less than expected I will probably keep them.
If you decide to try this, removing a commit may cause too much
conflicts, you want probably to reorder commits and group together
commits that are rewrites of each other.
This will be probably painful, and not give too much benefit so I
suggest you just merge the branch.

btw, there is still some dead code that need to be deleted before
merging. (the #if 0 in anjuta-project.c and corresponding prototypes)
My 2 cents.

Abderrahim