summaryrefslogtreecommitdiff
path: root/debian/README.source
diff options
context:
space:
mode:
Diffstat (limited to 'debian/README.source')
-rw-r--r--debian/README.source10
1 files changed, 10 insertions, 0 deletions
diff --git a/debian/README.source b/debian/README.source
index 89e832305..d99ddb7a7 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -191,6 +191,16 @@ file-ids are correct (see above). Run:
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 193
194Add a parent revision for the previous tarball branch, to make it easier for
195bzr to compute accurate merges.
196
197 bzr log -n0 /path/to/openssh/debian/trunk | less
198 # find revision number for previous tarball import, hence 'PREVIOUS'
199 bzr merge -rPREVIOUS /path/to/openssh/debian/trunk
200 # merge history only, no file changes
201 bzr revert .
202 bzr ci -m 'add 5.2p1 tarball parent revision'
203
194Next, merge this into the gssapi branch 204Next, merge this into the gssapi branch
195(bzr+ssh://bzr.debian.org/bzr/pkg-ssh/openssh/gssapi/). For this branch, we 205(bzr+ssh://bzr.debian.org/bzr/pkg-ssh/openssh/gssapi/). For this branch, we
196want to ignore the normal results of merging and take only the patch from 206want to ignore the normal results of merging and take only the patch from