Tracking changes -- merge unrelated banches?

Aaron Bentley aaron.bentley at utoronto.ca
Mon Jan 22 21:10:29 GMT 2007


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

Jari Aalto wrote:
> Aaron Bentley <aaron.bentley at utoronto.ca> writes:
> 
>>Now, if do have matching file-ids, you can cherrypick the changes to fix
>>bug23456 (for example) into foo-devel.
> 
> 
> So I've hit an point where the cherry picking would be the thinkg to
> use (if we had one).

We have one.  It's "merge -r BASE..END".  BASE is the direct parent of
the (first) revision that introduced the changes, END is the (last)
revision that introduced the changes.

We don't advertise it widely because we don't record cherry-pick
metadata, but since you don't care about metadata...

> That would allow transferring the changes around
> the branch trees that do not come fromt he same source

They still need matching file-IDs at minimum.

> Basicly I wouldn't much care about metadata, because the
> 
>     +bug23456/
>     +bug..../
> 
> would be just temporary branches that hold the fixes; which are only
> items to be transferred to the appropriate releases, until they are
> integrated to the upstream releases.

If there were upstream metadata, it would indicate when the upsteam had
merged the fixes.  So it would at least be convenient.

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

iD8DBQFFtShF0F+nu1YWqI0RAlEMAJwOFSWlkt+Lfw2fUIrmIydadTzskACbB631
ieD2ie+ENI1kbzjMLvDdJ+c=
=Epqs
-----END PGP SIGNATURE-----



More information about the bazaar mailing list