change parent location and be able to merge
bzr branch lp:pithos used to branch from http://
http://
bzr branch http://
Branched 206 revisions.
bzr info trunk
parent branch: http://
bzr branch lp:pithos
Branched 220 revisions.
bzr info pithos
parent branch: http://
If I change the parent location/branch from ~kevin-
cd trunk
bzr config parent_location=http://
bzr info
parent branch: http://
bzr merge
Merging from remembered parent location http://
bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified.
bzr config parent_location=http://
bzr info
parent branch: http://
bzr merge
Merging from remembered parent location http://
Nothing to do.
How can I change the parent location from the old location to the new location and be able to merge the latest changes into my branch? I cannot just use a new bzr branch because my branch has commits, merges, history, etc, that I do not want to lose.
Question information
- Language:
- English Edit question
- Status:
- Solved
- For:
- Bazaar Edit question
- Assignee:
- No assignee Edit question
- Solved by:
- Jared Silva
- Solved:
- Last query:
- Last reply: