summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/README.source26
1 files changed, 19 insertions, 7 deletions
diff --git a/debian/README.source b/debian/README.source
index 79e8558ee..6ec7578f8 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -126,10 +126,22 @@ file-ids are correct (see above). Run:
126 # the result will be mergeable 126 # the result will be mergeable
127 bzr ci -m 'Import 5.3p1 tarball' 127 bzr ci -m 'Import 5.3p1 tarball'
128 128
129You should now be able to 'bzr merge' from the tarball branch, resolve 129Next, merge this into the gssapi branch
130conflicts, and commit. If you see lots of "Contents conflict" messages, you 130(bzr+ssh://bzr.debian.org/bzr/pkg-ssh/openssh/gssapi/). For this branch, we
131may have got the file-ids wrong. Once you've committed the merge, you can 131want to ignore the normal results of merging and take only the patch from
132throw away the tarball branch, as all its history will have been 132http://www.sxw.org.uk/computing/patches/openssh.html; of course such a patch
133incorporated. 133needs to exist first! To do this, run this in the gssapi branch:
134 134
135(TODO: The above does not describe how to handle the gssapi branch.) 135 bzr merge /path/to/openssh/tarball/branch
136 bzr revert -rrevno:-1:/path/to/openssh/tarball/branch
137 patch -p1 </path/to/openssh/gssapi/patch
138 bzr add --file-ids-from=/path/to/openssh/debian/trunk
139 # you may need to deal with applying configure.ac changes to configure
140 # here
141 bzr ci -m 'import openssh-5.3p1-gsskex-all-20100124.patch'
142
143You should now be able to 'bzr merge' from the gssapi branch into the Debian
144trunk, resolve conflicts, and commit. If you see lots of "Contents conflict"
145messages, you may have got the file-ids wrong. Once you've committed the
146merge, you can throw away the tarball branch, as all its history will have
147been incorporated.