On 21 June 2010 07:29, Robert Collins <email address hidden> wrote:
> Review: Needs Information
> This has conflicts as vincent warned about.
>
> Whats up with this:
>
> 38 +<<<<<<< TREE
> 39 # Copyright (C) 2005-2010 Canonical Ltd
> 40 +=======
> 41 +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
> 42 +>>>>>>> MERGE-SOURCE
> 43 #
>
> The 2005-2010 form is a lot pithier; I don't recall a policy decision to avoid it?
I think John did a batch update to the first form and I arbitrarily
resolved the conflict to the first. The shorter form is fine with me.
> Could you please comment on vincents notes about using overrideAttr too. Thanks.
I didn't forget to use overrideAttr, I just wrote this before it was landed.
On 21 June 2010 07:29, Robert Collins <email address hidden> wrote:
> Review: Needs Information
> This has conflicts as vincent warned about.
>
> Whats up with this:
>
> 38 +<<<<<<< TREE
> 39 # Copyright (C) 2005-2010 Canonical Ltd
> 40 +=======
> 41 +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
> 42 +>>>>>>> MERGE-SOURCE
> 43 #
>
> The 2005-2010 form is a lot pithier; I don't recall a policy decision to avoid it?
I think John did a batch update to the first form and I arbitrarily
resolved the conflict to the first. The shorter form is fine with me.
> Could you please comment on vincents notes about using overrideAttr too. Thanks.
I didn't forget to use overrideAttr, I just wrote this before it was landed.
--
Martin