[Pkg-samba-maint] [samba] 01/04: Update README.source to keep upstream history

[Mathieu Parent]

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

sathieu pushed a commit to branch master
in repository samba.

commit 6ece0e686fa1f7cbbea6e5f5c60835efe5e0b091
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Jun 12 21:27:08 2016 +0200

    Update README.source to keep upstream history
---
 debian/README.source | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index fcb987e..014d0e9 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -14,12 +14,19 @@ Merging upstream releases
 
 Importing a new upstream version can be done like this:
 
+# set target version
+upstream_version=4.4.4
 # go to git repo
 cd $GIT_DIR
-# make sure to be on the right branch
+# Import upstream
+git checkout upstream_4.4
+git remote add upstream https://git.samba.org/samba.git
+git fetch upstream
+git merge "samba-${upstream_version}"
+# got to the Debian branch
 git checkout master
 # Import latest version
-gbp import-orig --uscan
+gbp import-orig --uscan -u "${upstream_version}"
 # all done :)
 
 

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