[Git-dpm-user] Importing new upstream release in existing tree

[Louis Bouchard]

Hi,

Le 20/11/2014 10:51, Louis Bouchard a écrit :
> Hello,
> 
> The upstream project I am working on has a new upstream release that I want to
> include in my git-dpm managed git repository[1].
> 
> I have tried the following method :
> 
>  * $ git-dpm import-new-upstream --rebase sosreport_3.2.orig.tar.gz
>  * Rebase my upstream-ubuntu/utopic branch with the new upstream branch
>  and
>  * $ git-dpm new-upstream --rebase sosreport_3.2.orig.tar.gz
> 
> In both cases, I end up with conflicts in the upstream code that I must fix,
> which is not what I expect. In my mind, I should not be touching the upstream
> code *ever*, only doing changes in the ./debian packaging files.
> 
> Am I right to be surprized by such a behavior ?
> 
> Here is an example of a session :

TL;DR

Just as a follow-up, it looks like if I do "git rebase --skip" on all of the
proposed conflicts, I end up with a clean tree with all of the files identical
to the upstream tarball.

Am I missing something here ?

Kind regards,

...Louis

-- 
Louis Bouchard
Software engineer, Cloud & Sustaining eng.
Canonical Ltd
Ubuntu developer                       Debian Maintainer
GPG : 429D 7A3B DD05 B6F8 AF63  B9C4 8B3D 867C 823E 7A61