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

[Louis Bouchard]

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 :


$ git clone git at github.com:karibou/sosreport.git
Cloning into 'sosreport'...
remote: Counting objects: 13822, done.
remote: Compressing objects: 100% (3902/3902), done.
remote: Total 13822 (delta 9459), reused 13808 (delta 9448)
Receiving objects: 100% (13822/13822), 3.90 MiB | 1.18 MiB/s, done.
Resolving deltas: 100% (9459/9459), done.
Checking connectivity... done.
caribou at marvin:tmpgit$ export PS1="$ "
$ cd sosreport
$ git checkout -b pristine-tar origin/pristine-tar
Branch pristine-tar set up to track remote branch pristine-tar from origin.
Switched to a new branch 'pristine-tar'
$ git checkout -b ubuntu/utopic origin/ubuntu/utopic
Branch ubuntu/utopic set up to track remote branch ubuntu/utopic from origin.
Switched to a new branch 'ubuntu/utopic'
$ cat debian/.git-dpm
# see git-dpm(1) from git-dpm package
8c1c48d30d8508d23f06db10ec1c9ece989133f9
8c1c48d30d8508d23f06db10ec1c9ece989133f9
9ce854d4925b54e829836af3905ee4424935d249
9ce854d4925b54e829836af3905ee4424935d249
sosreport_3.1.orig.tar.gz
c937644608096bc9b8e8f6d10d5aa1bd83110511
164165
$ git-dpm prepare
$ git branch
  master
  pristine-tar
* ubuntu/utopic
  upstream-ubuntu/utopic
$ git-dpm import-new-upstream --rebase ../sosreport_3.2.orig.tar.gz
Switched to a new branch 'patched-ubuntu/utopic'
Rebasing changes in 'patched-ubuntu/utopic' since
'9ce854d4925b54e829836af3905ee4424935d249' onto 'upstream-ubuntu/utopic'...
First, rewinding head to replay your work on top of it...
Auto-merging sos/policies/__init__.py
CONFLICT (content): Merge conflict in sos/policies/__init__.py
Auto-merging sos/plugins/emc.py
CONFLICT (content): Merge conflict in sos/plugins/emc.py

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

Once you finished rebase, don't forget to call update-patches


TIA,

Kind regards,

...Louis


[1] https://github.com/karibou/sosreport/tree/ubuntu/utopic
-- 
Louis Bouchard
Software engineer, Cloud & Sustaining eng.
Canonical Ltd
Ubuntu developer                       Debian Maintainer
GPG : 429D 7A3B DD05 B6F8 AF63  B9C4 8B3D 867C 823E 7A61