[Pkg-bazaar-commits] ./bzr-builddeb/trunk r227: Merge patch from Jelmer to use the branch config as well.

[James Westby]

------------------------------------------------------------
revno: 227
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Thu 2008-05-15 16:04:12 +0100
message:
  Merge patch from Jelmer to use the branch config as well.
  
  This allows bzr-builddeb to use the mergeWithUpstream property
  from svn-buildpackage if a recent enough bzr-svn is used.
modified:
  __init__.py
    ------------------------------------------------------------
    revno: 226.1.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: usebranch
    timestamp: Thu 2008-05-15 15:39:55 +0200
    message:
      Use branch-specific configuration when possible.
    modified:
      __init__.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2008-03-19 22:40:15 +0000
+++ b/__init__.py	2008-05-15 13:39:55 +0000
@@ -176,7 +176,7 @@
     else:
         config_files = [(local_conf, True), (global_conf, True),
                              (default_conf, False)]
-    config = DebBuildConfig(config_files)
+    config = DebBuildConfig(config_files, branch=tree.branch)
 
     if reuse:
       info("Reusing existing build dir")