Bzr and cherrypicking

[Aaron Bentley]

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

Matthieu Moy wrote:
> Aaron Bentley <aaron.bentley at utoronto.ca> writes:
> 
> 
>>Matthieu Moy wrote:
>>
>>>I suppose the merge itself is easy, but how is the merge history
>>>recorded then?
>>
>>It's not recorded at all, which isn't great, but it's better than
>>recording it as a full merge and those are our only options at present.
> 
> 
> (I've wikified this here http://bazaar.canonical.com/MergeTracking )

Thanks.  I noticed that Code Changes listed on that page have all been
done, so I removed them.

> So, it's the opposite of what tla does. tla's star-merge (I don't
> remember about baz merge) will ignore the previous patches, bzr will
> apply the patch twice.

Yeah.  The nasty thing about star-merge was that since it would select a
more recent base, it behaved as though you had deliberately removed
everything before the cherry-pick.

IIRC, replay --skip-present was about the safest thing you could do, but
it ran the risk of skipping some changes that were needed.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDVsBq0F+nu1YWqI0RAmi9AKCJlHAHbnotFP/uM2cmkAmPLwtISQCfejwP
+TzCePEfPrT0oN6lpFs7vwo=
=yaR8
-----END PGP SIGNATURE-----