Merge progress

[Martin Pool]

On Wed, 2005-04-20 at 15:21 -0400, Aaron Bentley wrote:

> Hi all,
> 
> I've made some progress on bzr merge.  

You certainly have, that looks good.

I see you still partially work in terms of generating a changeset to
apply.  Do you think we should do that rather than just operating on the
trees?

> Examples:
> # transform the versioned part of '.' into ../other
> $ bzr merge ../other .
> 
> # revert the above change
> $ bzr merge .@(bzr revno) .

So you like the @ syntax?  I was thinking about actually making it ./@12
rather than just . at 12 to make it a bit less likely to collide.

-- 
Martin

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050421/c59c6d98/attachment.pgp