From 87c685b8c6a49814fd782288097b3093f975aa72 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 6 Sep 2011 09:33:31 +0100 Subject: actually, let's upstream-tag the revision with a tarball parent instead --- debian/README.source | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: # compare this with 'bzr ls --show-ids' in the Debian trunk to make sure # the result will be mergeable bzr ci -m 'Import 5.3p1 tarball' - bzr tag upstream-5.3p1 Add a parent revision for the previous tarball branch, to make it easier for bzr to compute accurate merges. @@ -201,6 +200,7 @@ bzr to compute accurate merges. # merge history only, no file changes bzr revert . bzr ci -m 'add 5.2p1 tarball parent revision' + bzr tag upstream-5.3p1 Next, merge this into the gssapi branch (bzr+ssh://bzr.debian.org/bzr/pkg-ssh/openssh/gssapi/). For this branch, we -- cgit v1.2.3