From bbec4db36d464ea1d464a707625125f9fd5c7b5e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 31 Mar 2010 00:23:45 +0100 Subject: handle merge history from previous tarball branch --- debian/README.source | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'debian') 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: # the result will be mergeable bzr ci -m 'Import 5.3p1 tarball' +Add a parent revision for the previous tarball branch, to make it easier for +bzr to compute accurate merges. + + bzr log -n0 /path/to/openssh/debian/trunk | less + # find revision number for previous tarball import, hence 'PREVIOUS' + bzr merge -rPREVIOUS /path/to/openssh/debian/trunk + # merge history only, no file changes + bzr revert . + bzr ci -m 'add 5.2p1 tarball parent revision' + Next, merge this into the gssapi branch (bzr+ssh://bzr.debian.org/bzr/pkg-ssh/openssh/gssapi/). For this branch, we want to ignore the normal results of merging and take only the patch from -- cgit v1.2.3