Merge branch 'wip.remote' of git+ssh://git.debian.org/git/dgit-repos/repos/dgit into...

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 7ba0e87027ea329509254dad722b9038d694b572..4ea1aea85f2f4d8d5c03220b79f1d0d816ea25c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,15 @@ dgit (0.18~experimental1) experimental; urgency=low
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 06 Nov 2013 21:54:15 +0000
 
+dgit (0.17~experimental7) experimental; urgency=low
+
+  * manpage: Remove comment in BUGS about lack of policy docs
+    for Dgit field, which is specified now.  Closes:#720201.
+  * manpage: Make discussion of --existing-package less scary.  The
+    default archive access method no longer needs it.  Closes:#720171.
+
+ --
+
 dgit (0.17~experimental6) experimental; urgency=low
 
   * No update to code.  Upload to remove "DO NOT USE" indication.

diff --git a/dgit.1 b/dgit.1
index 61c4aa3e42328faeeecc0b3f61a6339d6f60a553..7e74d5b77f62fdfc2ad5782c3973e8b9b4907c62 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -361,13 +361,14 @@ filename suggests it is for the right package and version - or,
 if there is a _multi.changes file, dgit uses that.
 .TP
 .BI --existing-package= package
-dgit push needs to canonicalise the suite name.  But currently
-there is no way to ask the archive to do this without knowing the
+dgit push needs to canonicalise the suite name.  Sometimes, dgit
+lacks a way to ask the archive to do this without knowing the
 name of an existing package.  Without --new we can just use the
 package we are trying to push.  But with --new that will not work, so
 we guess
 .B dpkg
-or use the value of this option.
+or use the value of this option.  This option is not needed with the
+default mechanisms for accessing the archive.
 .TP
 .BR -h | --help
 Print a usage summary.
@@ -646,14 +647,6 @@ We should be using some kind of vhost/vpath setup for the git repos on
 alioth, so that they can be moved later if and when this turns out to
 be a good idea.
 
-Debian Policy needs to be updated to describe the new Dgit .dsc
-field (and to specify that it is an RC bug for that field to refer
-to an unavailable commit).
-
-The method of canonicalising suite names is bizarre.  See the
-.B --existing-package
-option for one of the implications.
-
 dgit push should perhaps do `git push origin', or something similar,
 by default.