[Pkg-gambas-devel] Hi, a new gambas3 release is available

[Ian Haywood]

On 13/04/14 17:09, Gianfranco Costamagna wrote:

> I'm a DM, I have alioth access since much time :)

> But I would like to see it updated prior to do that, to avoid useless merges things
>
> Even upstream and pristine-tar doesn't show the latest source tarball...
>
> People won't notice there is a git of the package unless you don't put in control file (and shows in PTS)
>
> anyway do you know any rationale for not using the current master?
because I don't know what I'm doing :)

I have found I simply cannot get git-import-orig to update the gambas 
sources in git properly
It tries to do a "merge" between the new and old versions and then 
complains about hundreds of "conflicts" which are simply upstreams changes.

I can't find a git command which means "override all conflicts and just 
use this version"

I've read the docs in detail and can't work it out. Obviously I'm "doing 
it wrong" but don't know why.

branch newmaster was my attempt to make the git sources reflect what's 
in the upstream tarball, but I ran into the same problem in the next update.

Currently I do my work in a fresh tree from unpacking the upstream 
tarball and then copy debian/ files back into the git tree and update. 
Annoying, but it works.

If you can fix it (and explain how you did it!) we'd all be much obliged.

Ian