Rev 1853: Merge 0.4. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1853
revision-id: jelmer at samba.org-20080907210222-rvt7g1bd7vjfsl6h
parent: jelmer at samba.org-20080907205145-ther8guzaqf8lcw3
parent: jelmer at samba.org-20080907205923-r531loa8e0nqdmjc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-09-07 23:02:22 +0200
message:
  Merge 0.4.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
    ------------------------------------------------------------
    revno: 1669.1.40
    revision-id: jelmer at samba.org-20080907205923-r531loa8e0nqdmjc
    parent: jelmer at samba.org-20080906041401-bb1lj1l960s9fnw0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-09-07 22:59:23 +0200
    message:
      Avoid NoneType error when no revisions to push in "bzr dpush".
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
=== modified file 'NEWS'
--- a/NEWS	2008-09-06 23:54:21 +0000
+++ b/NEWS	2008-09-07 21:02:22 +0000
@@ -54,6 +54,8 @@
 
    * Fix linking against Subversion 1.5 on Windows. (#263570)
 
+   * Avoid NoneType error when no revisions to push in "bzr dpush". (#267484)
+
 bzr-svn 0.4.12	2008-09-01
 
   BUG FIXES

=== modified file 'commit.py'
--- a/commit.py	2008-09-06 03:40:11 +0000
+++ b/commit.py	2008-09-07 21:02:22 +0000
@@ -697,12 +697,12 @@
         if stop_revision is None:
             stop_revision = ensure_null(source.last_revision())
         if target.last_revision() in (stop_revision, source.last_revision()):
-            return
+            return {}
         graph = target.repository.get_graph()
         if not source.repository.get_graph().is_ancestor(target.last_revision(), 
                                                         stop_revision):
             if graph.is_ancestor(stop_revision, target.last_revision()):
-                return
+                return {}
             raise DivergedBranches(source, target)
         todo = target.mainline_missing_revisions(source, stop_revision)
         revid_map = {}