aboutsummaryrefslogtreecommitdiff
path: root/docs/chapters
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2006-12-22 17:51:33 +0100
committerGuido Guenther <agx@bogon.sigxcpu.org>2006-12-22 17:51:33 +0100
commit62af3b51357f13584f1c8901c088280599c9ba81 (patch)
tree537825931df550f09c91e967aed8afbe33a52c3a /docs/chapters
parent8eadd9e525664b95ad58516cb3ad02ba6d544d73 (diff)
git-import-orig: improve error message when the upstream branch cannot be found.debian/0.2.20
We cannot create the branch automatically since on repositories not created by git-import-dsc it's not clear where to branch from. (Closes: #403990) While doing that also remove pointless patch arguments from most of the git helper functions Minor doc updates
Diffstat (limited to 'docs/chapters')
-rw-r--r--docs/chapters/import.sgml9
-rw-r--r--docs/chapters/special.sgml6
2 files changed, 9 insertions, 6 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index 7e54ed5..b91298a 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -1,6 +1,6 @@
<chapter id="gbp.import">
<title>Importing Sources</title>
- <sect1 id="dbp.import.existing">
+ <sect1 id="gbp.import.existing">
<title>Importing already existing &debian; packages</title>
<para>Imporing an already exsting debian package into a git repository is as easy as:
<screen>
@@ -12,7 +12,7 @@
used.
</para>
</sect1>
- <sect1 id="dbp.import.new.upstream">
+ <sect1 id="gbp.import.new.upstream">
<title>Importing a new upstream version</title>
<para>Change into your git repository, make sure it has all local
modifications committed and do:
@@ -21,8 +21,11 @@
</screen>
</para>
</sect1>
- <sect1 id="dbp.import.convert">
+ <sect1 id="gbp.import.convert">
<title>Converting an existing &git; repository</title>
+ <para>
+ If the &git; repository wasn't created with &git-import-dsc; you have to tell
+ &git-buildpackage; and friends where to find the upstream sources.
<sect2>
<title>Upstream sources on a branch</title>
<para>
diff --git a/docs/chapters/special.sgml b/docs/chapters/special.sgml
index 03de2ec..5fff3d3 100644
--- a/docs/chapters/special.sgml
+++ b/docs/chapters/special.sgml
@@ -1,6 +1,6 @@
<chapter id="gbp.special">
<title>Special usage cases</title>
- <sect1 id="dbp.special.dfsgfree">
+ <sect1 id="gbp.special.dfsgfree">
<title>Handling non-DFSG clean upstream sources</title>
<para>If you have to handle non DFSG clean upstream sources you can use a
different branch which you have to create once:
@@ -37,7 +37,7 @@ cleanup-script.sh
&gitcmd; pull . dfsg_clean
</screen>
- <sect1 id="dbp.special.nmus">
+ <sect1 id="gbp.special.nmus">
<title>Importing NMUs</title>
<para>
First create a branch that holds the NMUs once:
@@ -65,7 +65,7 @@ cleanup-script.sh
</note>
</sect1>
- <sect1 id="dbp.special.pbuilder">
+ <sect1 id="gbp.special.pbuilder">
<title>Using &pbuilder;</title>
<para>
Since pbuilder use different command line arguments than