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

[Martin Pool]

On 26 May 2006, Robert Collins <robertc at robertcollins.net> wrote:
> 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.

Yes, from the name of the test I think it as Robert says.  But it would
also be useful to add a test that there is some way to graft together
previously-unrelated trees.  (This is not to say that grafting has to
happen implicitly; perhaps you want an option to enable it?)

-- 
Martin