summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-09-06 09:33:31 +0100
committerColin Watson <cjwatson@debian.org>2011-09-06 09:33:31 +0100
commit87c685b8c6a49814fd782288097b3093f975aa72 (patch)
treecfeac403f11f6e05e238977d72216eca3bb47bcb
parentf75f0c81bc0b6f7c16d91f681f3f329952572e03 (diff)
actually, let's upstream-tag the revision with a tarball parent instead
-rw-r--r--debian/README.source2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/README.source b/debian/README.source
index 81f85fa25..cf28fbd48 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -190,7 +190,6 @@ file-ids are correct (see above). Run:
190 # compare this with 'bzr ls --show-ids' in the Debian trunk to make sure 190 # compare this with 'bzr ls --show-ids' in the Debian trunk to make sure
191 # the result will be mergeable 191 # the result will be mergeable
192 bzr ci -m 'Import 5.3p1 tarball' 192 bzr ci -m 'Import 5.3p1 tarball'
193 bzr tag upstream-5.3p1
194 193
195Add a parent revision for the previous tarball branch, to make it easier for 194Add a parent revision for the previous tarball branch, to make it easier for
196bzr to compute accurate merges. 195bzr to compute accurate merges.
@@ -201,6 +200,7 @@ bzr to compute accurate merges.
201 # merge history only, no file changes 200 # merge history only, no file changes
202 bzr revert . 201 bzr revert .
203 bzr ci -m 'add 5.2p1 tarball parent revision' 202 bzr ci -m 'add 5.2p1 tarball parent revision'
203 bzr tag upstream-5.3p1
204 204
205Next, merge this into the gssapi branch 205Next, merge this into the gssapi branch
206(bzr+ssh://bzr.debian.org/bzr/pkg-ssh/openssh/gssapi/). For this branch, we 206(bzr+ssh://bzr.debian.org/bzr/pkg-ssh/openssh/gssapi/). For this branch, we