[Sugar-devel] CIA bot disabled

[Walter Bender]

On Sat, Jul 17, 2010 at 9:10 AM, Bernie Innocenti <bernie at codewiz.org> wrote:
> El Fri, 16-07-2010 a las 10:52 +0200, Tomeu Vizoso escribió:
>> have disabled again the CIA bot because it's reporting old commits
>> when people merge.
>
> Git does merges on the local clone, so it can't be it.
>
> To avoid polluting the history with spurious merges, people should
> rebase their patches on top of the remote branch before pushing them.
>
> sugar-jhbuild already does this on update (git pull --rebase). You can
> also do it manually: git rebase origin/master. Add --interactive for
> some fun.
>
>
>> Please only activate it once uninteresting commits are filtered out.
>
> The cia glue script for gitorious could be made a lot smarter, but I
> have no time to look into it. Anyone else?
>
> I suspect that many irc floods are caused by activity on clones. Perhaps
> we could exclude those.
>
> --
>   // Bernie Innocenti - http://codewiz.org/
>  \X/  Sugar Labs       - http://sugarlabs.org/
>
> _______________________________________________
> Sugar-devel mailing list
> Sugar-devel at lists.sugarlabs.org
> http://lists.sugarlabs.org/listinfo/sugar-devel
>

Bernie,

When you return from holiday, perhaps you could review my various
scribblings in the wiki
(http://wiki.sugarlabs.org/go/Activity_Team/Git_FAQ) and update them
with such git pearls of wisdom?

thanks.

-walter


-- 
Walter Bender
Sugar Labs
http://www.sugarlabs.org