[Pkg-bazaar-commits] r141 ./bzr-builddeb/people/jdw/merge_upstream: A couple more spec updates

[James Westby]

------------------------------------------------------------
revno: 141
committer: James Westby <jw+debian at jameswestby.net>
branch nick: merge_upstream
timestamp: Wed 2007-07-04 21:54:21 +0100
message:
  A couple more spec updates
modified:
  specs/import-dsc
  specs/new-upstream-release-handling
-------------- next part --------------
=== modified file 'specs/import-dsc'
--- a/specs/import-dsc	2007-06-26 21:09:56 +0000
+++ b/specs/import-dsc	2007-07-04 20:54:21 +0000
@@ -1,5 +1,5 @@
-Building a remote branch
-========================
+Importing from source packages
+==============================
 
 Status: Part Implementation.
 
@@ -16,6 +16,10 @@
 and providing a way to import from them automatically will be a great aid to
 maintainers without copies of all of their uploaded packages.
 
+It should also aim to support incremental imports, so that the command can
+be used in an extant branch to import a .dsc in to the current state. This
+would allow uploads outside of the packaging system to be incorporated.
+
 Design
 ------
 
@@ -85,3 +89,21 @@
 mode is complicated by the fact that the old packages may have changes outside
 debian/.
 
+UI
+--
+
+Have a command
+
+  bzr deb import-dsc
+
+which imports a set of .dsc files, given on the command line. Can either be
+local or remote.
+
+Could also take a file which lists the files to import.
+
+A --snapshot option that supplements the files on the command line
+with those stored at snapshot.d.n. This might need to take the name of the
+package as an option, but it would be better to avoid that.
+
+An option to name the output branch would be good.
+

=== modified file 'specs/new-upstream-release-handling'
--- a/specs/new-upstream-release-handling	2007-06-24 15:01:46 +0000
+++ b/specs/new-upstream-release-handling	2007-07-04 20:54:21 +0000
@@ -1,7 +1,7 @@
 Handling of new upstream releases
 =================================
 
-Status: Draft
+Status: Partial implementation
 
 Rationale
 ---------
@@ -63,9 +63,9 @@
 Design
 ------
 
-A new command something like ``deb-new-upstream`` that takes the version number
-and does the right thing, or errors out if it doesn't have the information to
-decide. Perhaps it could prompt for the information it needs.
+A new command something like that takes the version number and does the right
+thing, or errors out if it doesn't have the information to decide. Perhaps it
+could prompt for the information it needs.
 
 Normal mode
 -----------
@@ -110,6 +110,17 @@
 for the last upstream version. If tags are also made for packaging releases
 then they could be even more useful.
 
+UI
+--
+
+A new command
+
+  bzr deb merge-upstream
+
+that takes the new upstream version as an argument. A tarball must be supplied
+for those modes that need it, and can be supplied for those that can use it.
+This tarball can be local or remote.
+
 Code changes
 ------------