126
126
# the result will be mergeable
127
127
bzr ci -m 'Import 5.3p1 tarball'
129
You should now be able to 'bzr merge' from the tarball branch, resolve
130
conflicts, and commit. If you see lots of "Contents conflict" messages, you
131
may have got the file-ids wrong. Once you've committed the merge, you can
132
throw away the tarball branch, as all its history will have been
135
(TODO: The above does not describe how to handle the gssapi branch.)
129
Next, merge this into the gssapi branch
130
(bzr+ssh://bzr.debian.org/bzr/pkg-ssh/openssh/gssapi/). For this branch, we
131
want to ignore the normal results of merging and take only the patch from
132
http://www.sxw.org.uk/computing/patches/openssh.html; of course such a patch
133
needs to exist first! To do this, run this in 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
141
bzr ci -m 'import openssh-5.3p1-gsskex-all-20100124.patch'
143
You should now be able to 'bzr merge' from the gssapi branch into the Debian
144
trunk, resolve conflicts, and commit. If you see lots of "Contents conflict"
145
messages, you may have got the file-ids wrong. Once you've committed the
146
merge, you can throw away the tarball branch, as all its history will have