chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: Rename a variable $ups_tag to $ups_rev
[dgit.git]
/
dgit-maint-merge.7.pod
diff --git
a/dgit-maint-merge.7.pod
b/dgit-maint-merge.7.pod
index 0ccd8c7e7fd6f5885e5c471ec75f3a7c429b3f50..51b6a69dbf4ebc29df23251ef8024b3818d06e71 100644
(file)
--- a/
dgit-maint-merge.7.pod
+++ b/
dgit-maint-merge.7.pod
@@
-166,7
+166,7
@@
Now create I<debian/gbp.conf>:
[DEFAULT]
upstream-branch = upstream
debian-branch = master
[DEFAULT]
upstream-branch = upstream
debian-branch = master
- upstream-tag = %(version)s
+ upstream-tag =
upstream/
%(version)s
sign-tags = True
pristine-tar = False
sign-tags = True
pristine-tar = False
@@
-174,6
+174,7
@@
Now create I<debian/gbp.conf>:
[import-orig]
merge-mode = merge
[import-orig]
merge-mode = merge
+ merge = False
=back
=back
@@
-193,7
+194,7
@@
Then we can import the upstream version:
=over 4
=over 4
- % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz
+ % gbp import-orig --merge
--merge
-mode=replace ../foo_1.2.2.orig.tar.xz
=back
=back
@@
-362,7
+363,7
@@
to git), you can just run dpkg-buildpackage(1) or debuild(1) instead.
=over 4
=over 4
- % git
remote update
+ % git
fetch --tags upstream
=back
=back
@@
-381,7
+382,7
@@
Then, either
=over 4
=over 4
- % gbp import-orig
--no-merge
../foo_1.2.3.orig.tar.xz
+ % gbp import-orig ../foo_1.2.3.orig.tar.xz
=back
=back
@@
-389,10
+390,12
@@
or if you have a working watch file
=over 4
=over 4
- % gbp import-orig --
no-merge --
uscan
+ % gbp import-orig --uscan
=back
=back
+In the following, replace I<1.2.3> with I<upstream/1.2.3>.
+
=head2 Reviewing & merging the release
It's a good idea to preview the merge of the new upstream release.
=head2 Reviewing & merging the release
It's a good idea to preview the merge of the new upstream release.