Branching with a Central Repository

[Tom Widmer]

John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> 
> ...
> 
>>>     # Merge in the changes
>>>     bzr merge f:\root\ProjectGroup\Project1\feature-gui
>> bzr merge feature-gui
>> (again using a relative path)
>>
>>> Is there a better way to do this?  I've been reading the
>>> documentation, but most of the branching/merging discussion focuses on
>>> the distributed development workflow.
>> The relative path trick makes things much simpler.
>>
>> Tom
> 
> I believe that 'switch' supports relative paths, but 'merge' does not yet.

I think the feature could be improved and generalised. For example, 
there could be specific URL prefixes you could use for various relative 
paths, such as:

^ = repo root of branch this is a checkout of
~ = parent folder of branch this is a checkout of
others? Obviously, the prefixes could be anything.

Say you have:
trunk
branches/mybug1
branches/mybug2
branches/mybug3

You might do:

bzr co <full url of trunk>
bzr switch ~/branches/mybug1
hack hack hack
bzr commit
bzr merge ^/trunk
bzr commit

bzr switch ^/trunk
(does that implicitly do a bzr update?)
bzr update?
bzr merge ~/branches/mybug1
bzr commit

or similar. WDYT?

Tom