Stefan Sperling:

> Picking changes in sequence such that a locally added file gets
> modified again results in a bogus error:
> 
> This happens because check_merge_ok() compares the base commit's ID
> to the zero ID. Added files do not yet have base commit and should
> thus be excluded from this check.

Well, it certainly fixes my problem.

ok

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de