WE need support to merge colocated branches
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Invalid
|
Undecided
|
Unassigned |
Bug Description
Am I missing something? merge not supported for colocated branches?
spundun@
spundun@
Created a standalone tree (format: development-colo)
spundun@
adding a
Committing to: /tmp/A/
added a
Committed revision 1.
spundun@
Tree is up to date at revision 1.
Switched to branch: /tmp/A/
spundun@
Tree is up to date at revision 1.
Switched to branch: /tmp/A/
spundun@
adding b
Committing to: /tmp/A/
added b
Committed revision 2.
spundun@
Updated to revision 1.
Switched to branch: /tmp/A/
spundun@
a
spundun@
merger: <bzrlib.
bzr: ERROR: Path(s) do not exist: br2
spundun@
merger: <bzrlib.
bzr: ERROR: Path(s) do not exist: .bzr/branches/br2
spundun@
merger: <bzrlib.
bzr: ERROR: Path(s) do not exist: ./.bzr/branches/br2
spundun@
This ... works... :/ So I have a workaround. It'd be nice to be able to work with just on working directory though.
spundun@ ubuntu: /tmp/A$ bzr switch br2 ubuntu: /tmp/A$ ls ubuntu: /tmp/A$ bzr branch . B/ ubuntu: /tmp/A$ cd B/ ubuntu: /tmp/A/ B$ ls ubuntu: /tmp/A/ B$ bzr info
Updated to revision 2.
Switched to branch: /tmp/A/
spundun@
a b B
spundun@
Branched 2 revisions.
spundun@
spundun@
a b
spundun@
Standalone tree (format: development-colo)
Location:
branch root: .
Related branches: ubuntu: /tmp/A/ B$ bzr log ------- ------- ------- ------- ------- ------- ------- ---- ------- ------- ------- ------- ------- ------- ------- ---- ubuntu: /tmp/A/ B$ cd .. ubuntu: /tmp/A$ ls ubuntu: /tmp/A$ bzr switch br1 ubuntu: /tmp/A$ bzr merge B ubuntu: /tmp/A$ ls ubuntu: /tmp/A$ bzr status ubuntu: /tmp/A$ bzr commit ubuntu: /tmp/A$ bzr status ubuntu: /tmp/A$ bzr log ------- ------- ------- ------- ------- ------- ------- ---- ------- ------- ------- ------- ------- ------- ------- ---- ------- ------- ------- ------- ------- ------- ------- ---- ubuntu: /tmp/A$
parent branch: /tmp/A
spundun@
-------
revno: 2
committer: Spundun Bhatt <email address hidden>
branch nick: br2
timestamp: Mon 2013-04-29 10:58:13 -0700
message:
B
-------
revno: 1
committer: Spundun Bhatt <email address hidden>
branch nick: A
timestamp: Mon 2013-04-29 10:57:43 -0700
message:
A
spundun@
spundun@
a b B
spundun@
Updated to revision 1.
Switched to branch: /tmp/A/
spundun@
+N b
All changes applied successfully.
spundun@
a b B
spundun@
added:
b
unknown:
B/
pending merge tips: (use -v to see all merge revisions)
Spundun Bhatt 2013-04-29 B
spundun@
Committing to: /tmp/A/
added b
Committed revision 2.
spundun@
unknown:
B/
spundun@
-------
revno: 2 [merge]
committer: Spundun Bhatt <email address hidden>
branch nick: br1
timestamp: Mon 2013-04-29 11:23:01 -0700
message:
Merged B
-------
revno: 1
committer: Spundun Bhatt <email address hidden>
branch nick: A
timestamp: Mon 2013-04-29 10:57:43 -0700
message:
A
-------
Use --include-merged or -n0 to see merged revisions.
spundun@