Intent of TestCommitMerge.test_merge_new_file? (was: [RFC] browsing history API)

[Robert Collins]

On Fri, 2006-05-26 at 08:20 -0400, Aaron Bentley wrote:
> 
> Or is it meant to be an example of different changes to the same
> branch
> not interfering with each other?  If so, x and y should have the same
> root id. 

The latter I think. I shall check properly shortly, but the name says to
me that its merging a new file - that is a file that is new in this
branch, merged from a sibling branch, not from a different tree.

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/20060526/c9b21106/attachment.pgp