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

[Gianfranco Costamagna]

> Il Lunedì 14 Aprile 2014 6:34, Ian Haywood <ian at haywood.id.au> ha scritto:
> > 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.


The problem has been a double import of the same version in "pristine-tar" branch.

There isn't an easy situation to fix this, I had this problem in different repository I maintain, and I ended up by:
importing the new release with git-import-orig
wait for the merge to fail
remove all in master (no commit, just remove) except for the debian directory (and the .git of course)
copy the extracted tarball into master
commit

something like
git-import-orig --pristine-tar ../tarball.tar.gz
merge failed
mv debian ..
rm * -rf
mv ../debian .
tar xzvf ../tarball.tar.gz
cp ../tarball/* .
git commit -a (git add if needed)

next time hopefully after this manual merge you won't have any problem.


the same can be done from newmaster to master, and then you can get rid of the useless newmaster and start working on the real branch.

Can you try to fix it yourself?
I have a local clone of the repository, I can fixup things for you if something goes bad ;)

cheers,

Gianfranco

BTW since of the poppler transition I don't think this release will reach testing anytime soon :(
> 
> 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
>