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

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> 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.

I'm a bit concerned that we'll lose a decent chunk of annotation history
for things that get cherry-picked in this fashion. (At a minimum see the
recent discussion about annotations and multiple revisions introducing
the same content.)

So I'd sort of rather review things in bite-sized chunks, but then merge
the whole branch if we can.
John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknVdhAACgkQJdeBCYSNAAPRCACgjWodIK3J4jPQ89g77ImmbiaS
jscAoKj8kADx3Jjai/6qzeTuRrrDpAzM
=Xu49
-----END PGP SIGNATURE-----