diff options
Diffstat (limited to 'debian/README.source')
| -rw-r--r-- | debian/README.source | 2 |
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 | ||
| 195 | Add a parent revision for the previous tarball branch, to make it easier for | 194 | Add a parent revision for the previous tarball branch, to make it easier for |
| 196 | bzr to compute accurate merges. | 195 | bzr 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 | ||
| 205 | Next, merge this into the gssapi branch | 205 | Next, 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 |