What we did at UBZ

[Aaron Bentley]

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

Jan Hudec wrote:
| On Fri, Nov 18, 2005 at 17:40:22 -0500, Aaron Bentley wrote:
|
|>Jan Hudec wrote:
|
| [...]
|
|>> - And of course, the definition of pull remains that it can only apply
|>>   revisions, that are descenants of the current destination head.
|>
|>No, the definition becomes that pull can only apply revisions that are
|>desdants of the current destination head, and that the destination head
|>must be the first parent.
|
|
| It will _not_ be the first parent. It will be second one if it's a merge.

If it's a merge, you won't be able to pull.

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

iD8DBQFDgKHF0F+nu1YWqI0RAnz8AJ4ir1OICkDf7mHtTO8+C35RZOFfxACcCrwB
xGyfKyLDMqEjFVqUVPti/R4=
=EeT7
-----END PGP SIGNATURE-----