bzr-colo

Merge lp:~songofacandy/bzr-colo/allow-colo-pull-in-subdir into lp:bzr-colo

  1. allow-colo-pull-in-subdir
  2. Merge into trunk
Proposed by methane
Status: Merged
Merged at revision: 114
Proposed branch: lp:~songofacandy/bzr-colo/allow-colo-pull-in-subdir
Merge into: lp:bzr-colo
Diff against target: 28 lines (+6/-1)
2 files modified
NEWS.txt (+5/-0)
commands.py (+1/-1)
To merge this branch: bzr merge lp:~songofacandy/bzr-colo/allow-colo-pull-in-subdir
Reviewer Review Type Date Requested Status
Neil Martinsen-Burrell Pending
Review via email: mp+70648@code.launchpad.net

Description of the change

Allow colo-pull in sub directory

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS.txt'
2--- NEWS.txt 2011-06-27 03:24:27 +0000
3+++ NEWS.txt 2011-08-06 09:29:29 +0000
4@@ -5,6 +5,11 @@
5 bzr-colo 0.3.1 (in development)
6 ###############################
7
8+Bug Fixes
9+---------
10+
11+* Allow colo-pull in sub directory of a branch.
12+
13
14 bzr-colo 0.3.0
15 ##############
16
17=== modified file 'commands.py'
18--- commands.py 2011-05-29 02:25:35 +0000
19+++ commands.py 2011-08-06 09:29:29 +0000
20@@ -429,7 +429,7 @@
21 result.report(self.outf)
22 if name == current:
23 # update the working tree
24- tree = workingtree.WorkingTree.open(directory)
25+ tree, _ = workingtree.WorkingTree.open_containing(directory)
26 conflicts = tree.update()
27 if conflicts > 0:
28 return 1

Subscribers

People subscribed via source and target branches