[MERGE] Add sha generation support to versionedfiles (brisbane)

[Robert Collins]

On Fri, 2009-04-03 at 11:09 +1000, Ian Clatworthy wrote:
> From brisbane-core (but without the groupcompress stuff yet).
> 
> Chatting to Robert on IRC, the plan for merging brisbane-core
> is to put up a series of bite-sized patches. Merge won't let me
> cherrypick files so here's how I'm doing it ...
> 
> cd brisbane-core
> #bzr diff -rancestor:../bzr.dev x1 x2 x3 > ../bris-diffs/x.diff
> cd ..
> bzr branch bzr.dev bzr.bris-x
> cd bzr.bris-x
> #bzr patch ../bris-diffs/x.diff

bzr merge ../brisbane-core/bzrlib/file
bzr merge --force ../brisbane-core/bzrlib/file2
etc

> (review patch)
> (run tests)
> bzr send ...
> 
> Is there a better way? Do we care about retaining file-ids
> for files added to the brisbane-core branch?

merge will do that for you.

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