[vim] 03/05: Clarify how to update patches on the latest upstream code

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit f25264c9a2b02b8ba90bc054d7fae3d4ca0a829d
Author: James McCoy <jamessan at debian.org>
Date:   Mon Sep 12 21:12:49 2016 -0400

    Clarify how to update patches on the latest upstream code
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/README.source | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index ae99abd..f4d85a1 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -18,8 +18,16 @@ use the "upstream" topic.  Alternatively, if the patch is not intended to be
 upstreamed, it should use the "debian" topic and be applied after any upstream
 patches.
 
-When updating to a new version of upstream code, the “gbp pg rebase” command
-will rebase the patch queue against the new upstream code.
+When updating to a new version of upstream code, the patches need to be rebased
+on the new upstream code.  The process is
+
+* Create the patch-queue branch -- gbp pq import
+* Switch back to the packaging branch -- gbp pq switch
+* Merge the upstream tag -- git merge vX.Y.ZZZZ
+* Rebase the patches -- gbp pq rebase
+  * Make any adjustments/fixups, as necessary
+* Switch back to the packaging branch -- gbp pq switch
+* Export the patches -- gbp pq export
 
 Whenever the patch queue branch is modified, those changes need to be exported
 back to the packaging branch.  “gbp pq switch” will change from the patch queue

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git