[Pkg-bazaar-commits] r147 ./bzr-builddeb/people/jdw/merge_upstream: Disallow merge-upstream for split mode as well.

[James Westby]

------------------------------------------------------------
revno: 147
committer: James Westby <jw+debian at jameswestby.net>
branch nick: merge_upstream
timestamp: Mon 2007-07-09 20:52:45 +0100
message:
  Disallow merge-upstream for split mode as well.
modified:
  __init__.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2007-07-08 19:47:41 +0000
+++ b/__init__.py	2007-07-09 19:52:45 +0000
@@ -330,8 +330,10 @@
       raise BzrCommandError("Merge upstream in native mode is not yet "
                             "supported")
     if config.export_upstream:
-      raise BzrCommandError("Merge upstream in export upstream is not yet "
+      raise BzrCommandError("Export upstream mode is not yet "
                             "supported")
+    if config.split:
+      raise BzrCommandError("Split mode is not yet supported")
 
     if package is None:
       try: