Unable to pump from parent branch once pipeline is created
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://
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/
> cd branches/
---- 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-
---- 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-