From b1806bc331028a3cd034c33f0a05d737f921fd1c Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Tue, 16 Oct 2007 20:13:55 +0200 Subject: minor updates and clarifications --- docs/chapters/special.sgml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'docs/chapters/special.sgml') diff --git a/docs/chapters/special.sgml b/docs/chapters/special.sgml index e63da06..6c2207f 100644 --- a/docs/chapters/special.sgml +++ b/docs/chapters/special.sgml @@ -10,7 +10,7 @@ This creates the dfsg_clean branch from the tip of your upstream branch. Then, when importing a new - upstream version you import the new version on the + upstream version, you import the new version on the upstream branch as usual and just don't merge to the master branch by default: @@ -46,22 +46,18 @@ cleanup-script.sh &gitcmd; nmu - To import an NMU instead of a new upstream version you can use: + To import an NMU instead of a new upstream version simply import the + unpacked NUMs source tree into your repository: &gitcmd; checkout master -&git-import-orig; -u 10-1.1 --upstream-branch=nmu nmu-10-1.1.tar.gz +&git-import-orig; -u 10-1.1 --upstream-branch=nmu /path/to/nmu-10/ This will import the NMU on the nmu branch instead of the upstream branch but merge the changes to the master branch as usual. - - - You need to have the NMU as a single tar.gz, you can't use the - dsc and diff.gz here, this will be fixed in a later version. - -- cgit v1.2.1