What we did at UBZ

[Jan Hudec]

On Sun, Nov 20, 2005 at 11:18:13 -0500, Aaron Bentley wrote:
> -----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.

So please make it so that I will. It's OK if it requires an option to pull
(though I still don't see a reason why it should not be the default),
but --overwrite is clobbers too much.

-- 
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051120/d0eef368/attachment.pgp