Intent of TestCommitMerge.test_merge_new_file?

[Robert Collins]

On Mon, 2006-05-29 at 21:19 +1000, Martin Pool wrote:
> 
> > Interesting.  Given that step 4 of graft is "remove the control
> > directory of bar", that may be a problem.
> 
> Well, I won't absolutely insist on revert working, but there does seem
> some risk here that people will lose some of their history.

Perhaps it would be easier to start with the inverse operation of graft,
where you split two trees and their history.

If you define that such that it works on the current working tree +
history, not just on the committed revisions, then you are able to
recreate the original bzr control directory of bar minus only the
optional per-user config stuff like 'parent'.

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/20060529/e595230d/attachment.pgp