bzr-builddeb

Merge lp:~jelmer/bzr-builddeb/merge-3 into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

  1. merge-3
  2. Merge into trunk-old
Proposed by Jelmer Vernooij
Status: Merged
Merge reported by: James Westby
Merged at revision: not available
Proposed branch: lp:~jelmer/bzr-builddeb/merge-3
Merge into: lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old
Diff against target: None lines
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/merge-3
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+5571@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

The attached patch makes DebBuildConfig consider the tree object as well,
so mergeWithUpstream gets picked up properly.

Cheers,

Jelmer

Revision history for this message
James Westby (james-w) wrote :

Merged, thanks.

James

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmds.py'
2--- cmds.py 2009-03-04 13:05:56 +0000
3+++ cmds.py 2009-04-15 11:36:37 +0000
4@@ -130,7 +130,7 @@
5 if tree.path2id(default_conf):
6 config_files.append((tree.get_file(tree.path2id(default_conf)), False,
7 "default.conf"))
8- config = DebBuildConfig(config_files)
9+ config = DebBuildConfig(config_files, tree=tree)
10 config.set_user_config(user_config)
11 return config
12

Subscribers

People subscribed via source and target branches