[Debian-med-packaging] MNE v0.8 packaging

[Andreas Tille]

On Fri, Aug 01, 2014 at 03:34:45AM +0200, Alexandre Gramfort wrote:
> >> uscan --verbose --force-download
> 
> this works

OK.
 
> >> git import-orig --pristine-tar ../python-mne_0.8.orig.tar.gz
> 
> I had to specify debian as my debian-branch in .git/gbp.conf
> as otherwise it was merging to my master branch.

Usually it should merge to *upstream* branch.  I have no gbp.conf file
(which rather would belong to the debian/ dir if I'm not totally
mistaken) and it always worked fine that way.

> Yet this now produces
> merge conflicts. It there a way to use something like
> --strategy-option theirs in the merge?
> 
> is it fine if I do the merge manually ? that will keep all the history though.

Do you get

$ git import-orig --pristine-tar ../python-mne_0.8.orig.tar.gz
...
pristine-tar: committed python-mne_0.8.orig.tar.gz.delta to branch pristine-tar
gbp:info: Merging to 'master'
gbp:error: Merge failed, please resolve.


$ LC_ALL=C git status
...
Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:   mne/tests/test_utils.py
        both modified:   mne/utils.py

?

Please always post such details rather than "this now produces merge
conflicts".  Any yes, while I have no idea why this is happening this is
probably the way to go.  Some more experienced Git experts than me might
insist if I'm wrong.
 
> thanks for your help

Kind regards

      Andreas. 

-- 
http://fam-tille.de