diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2017-06-16 13:04:58 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-01-06 01:23:39 +0000 |
| commit | 303f60ed281bee140e59a11b043267d4ffc1a550 (patch) | |
| tree | 8700fad83d50996066a135dc074b5f72d82f89fd /dgit-maint-merge.7.pod | |
| parent | 5b04e9b23dcc7596db6eb9812c063f0069b76282 (diff) | |
dgit-maint-merge(7): Create an empty branch for upstream source
Thanks to Johannes Schauer for finding the problem.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'dgit-maint-merge.7.pod')
| -rw-r--r-- | dgit-maint-merge.7.pod | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 901707e..995fe8b 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -148,12 +148,23 @@ Now create I<debian/gbp.conf>: =back -Then we can import the upstream version: +gbp-import-orig(1) requires a pre-existing upstream branch: =over 4 % git add debian/gbp.conf && git commit -m "create gbp.conf" - % gbp import-orig ../foo_1.2.2.orig.tar.xz + % git checkout --orphan upstream + % git rm -rf . + % git commit --allow-empty -m "initial, empty branch for upstream source" + % git checkout -f master + +=back + +Then we can import the upstream version: + +=over 4 + + % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz =back |