WE need support to merge colocated branches

Bug #1174445 reported by Spundun
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
Invalid
Undecided
Unassigned

Bug Description

Am I missing something? merge not supported for colocated branches?

spundun@ubuntu:/tmp$ mkdir A && cd A
spundun@ubuntu:/tmp/A$ bzr init --development-colo
Created a standalone tree (format: development-colo)
spundun@ubuntu:/tmp/A$ touch a && bzr add a && bzr commit -m A
adding a
Committing to: /tmp/A/
added a
Committed revision 1.
spundun@ubuntu:/tmp/A$ bzr switch -b br1
Tree is up to date at revision 1.
Switched to branch: /tmp/A/
spundun@ubuntu:/tmp/A$ bzr switch -b br2
Tree is up to date at revision 1.
Switched to branch: /tmp/A/
spundun@ubuntu:/tmp/A$ touch b && bzr add b && bzr commit -m B
adding b
Committing to: /tmp/A/
added b
Committed revision 2.
spundun@ubuntu:/tmp/A$ bzr switch br1
Updated to revision 1.
Switched to branch: /tmp/A/
spundun@ubuntu:/tmp/A$ ls
a
spundun@ubuntu:/tmp/A$ bzr merge br2
merger: <bzrlib.merge.Merger object at 0x1143d10>
bzr: ERROR: Path(s) do not exist: br2
spundun@ubuntu:/tmp/A$ bzr merge .bzr/branches/br2
merger: <bzrlib.merge.Merger object at 0x1db2a90>
bzr: ERROR: Path(s) do not exist: .bzr/branches/br2
spundun@ubuntu:/tmp/A$ bzr merge ./.bzr/branches/br2
merger: <bzrlib.merge.Merger object at 0x11bca90>
bzr: ERROR: Path(s) do not exist: ./.bzr/branches/br2
spundun@ubuntu:/tmp/A$

Tags: colocate
Revision history for this message
Spundun (spundun) wrote :

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
Updated to revision 2.
Switched to branch: /tmp/A/
spundun@ubuntu:/tmp/A$ ls
a b B
spundun@ubuntu:/tmp/A$ bzr branch . B/
Branched 2 revisions.
spundun@ubuntu:/tmp/A$ cd B/
spundun@ubuntu:/tmp/A/B$ ls
a b
spundun@ubuntu:/tmp/A/B$ bzr info
Standalone tree (format: development-colo)
Location:
  branch root: .

Related branches:
  parent branch: /tmp/A
spundun@ubuntu:/tmp/A/B$ bzr log
------------------------------------------------------------
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@ubuntu:/tmp/A/B$ cd ..
spundun@ubuntu:/tmp/A$ ls
a b B
spundun@ubuntu:/tmp/A$ bzr switch br1
Updated to revision 1.
Switched to branch: /tmp/A/
spundun@ubuntu:/tmp/A$ bzr merge B
+N b
All changes applied successfully.
spundun@ubuntu:/tmp/A$ ls
a b B
spundun@ubuntu:/tmp/A$ bzr status
added:
  b
unknown:
  B/
pending merge tips: (use -v to see all merge revisions)
  Spundun Bhatt 2013-04-29 B
spundun@ubuntu:/tmp/A$ bzr commit
Committing to: /tmp/A/
added b
Committed revision 2.
spundun@ubuntu:/tmp/A$ bzr status
unknown:
  B/
spundun@ubuntu:/tmp/A$ bzr log
------------------------------------------------------------
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@ubuntu:/tmp/A$

Revision history for this message
Spundun (spundun) wrote :

Don't be confused byt the output of the first ls
spundun@ubuntu:/tmp/A$ ls
a b B

That was a mistake, I was playing around a bit and I didn't paste the output correctly, it should read
spundun@ubuntu:/tmp/A$ ls
a b

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

try "bzr merge co:br2"

Revision history for this message
Spundun (spundun) wrote :

Yes! That worked!

Thank you !

Changed in bzr:
status: New → Invalid
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers