tree transform is malformed ??

[Robert Collins]

On Mon, 2006-05-01 at 02:17 -0400, Aaron Bentley wrote:
> 
> 
> The meat is: call resolve_conflicts(), to resolve the conflicts and
> get 
> a list of the raw conflicts that were encountered, and the
> resolutions 
> done.  Call cook_conflicts to get a list of Conflict objects, which
> can 
> be converted to strings and/or saved in the the working tree.  Emit
> the 
> conflicts as warnings.

Ok. What will this do with the following scenario:

Branch A has a dir 'foo' in the HEAD revision.
Branch B is location at dir 'foo/bar' in the branch directory of branch
A.

'bzr checkout' in the branch dir of branch A:

$ls -a
foo
.bzr

$ls -a foo
bar

$ls -a foo/bar
.bzr

$bzr checkout

What I want this to do is to leave foo/bar in place and untouched.

Rob


-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060501/47d672bb/attachment.pgp