Unable to pump from parent branch once pipeline is created

Bug #1012221 reported by Alex Lewis
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
bzr-pipeline
New
Undecided
Unassigned

Bug Description

Bazaar (bzr) 2.5.0
pipeline 1.4.0
------------------------
I don't think this is probably a great problem but I'd thought I'd raise it as it seems to conflict with the documentation provided at http://wiki.bazaar.canonical.com/BzrPipeline under the "Developing a series of changes with Pipeline" section.

When creating a pipeline in a branch the "parent branch" location is lost so can't use "bzr pump --from :submit" or "bzr pump --from :parent"

Steps:
> mkdir pipe_test
> cd pipe_test
> bzr init-repo .
> bzr init trunk
> cd trunk
> echo "Hello" > file.txt
> bzr add file.txt
> bzr commit -m "Initial commit"
> cd ..
> mkdir branches
> branch trunk/ branches/new-feature
> cd branches/new-feature
---- Doing a "bzr info" here shows that "trunk" is the parent branch of "new-feature". So I can do a pull if I haven't made any changes or merge if they'd diverged. *See below for something else I noticed...
> bzr nick part1
> bzr reconfigure-pipeline
---- Doing a "bzr info" here now shows it is a lightweight checkout but the only Related Branches is "parent branch" of "." So I can't do a "bzr pump --from :submit" or "bzr pump --from :parent" to pull in changes from "trunk".
> bzr add-pipe part2
> echo "Part2 change" >> file.txt
> bzr commit -m "Part 2 change"
---- At this point I have to switch to part1, merge from trunk (resolve any conflicts), commit and pump.

*If before creating the pipeline some changes had been made in "new-feature" and a merge done from "trunk" the "submit branch" is set for "new-feature". So doing a bzr-info in "new-feature" will show both parent and submit branches as "trunk". If you then do a reconfigure-pipeline both the submit and parent branch info is lost so "bzr info new-feature" only shows "Parent branch" of ".", so again "pump :submit" doesn't work as no submit branch is set.

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.