[U-Boot] [PATCH 1/2] buildman: Allow conflicting tags to avoid spurious errors

[Simon Glass]

On Mon, May 6, 2013 at 8:33 AM, Simon Glass <sjg at chromium.org> wrote:
> Hi Tom,
>
> On Fri, May 3, 2013 at 5:25 PM, Tom Rini <trini at ti.com> wrote:
>> On Thu, May 02, 2013 at 05:46:02PM -0700, Simon Glass wrote:
>>
>>> Conflicting tags can prevent buildman from building two series which exist
>>> one after the other in a branch. There is no reason not to allow this sort
>>> of workflow with buildman, so ignore conflicting tags in buildman.
>>>
>>> Signed-off-by: Simon Glass <sjg at chromium.org>
>>> ---
>>>  tools/buildman/control.py | 5 +++++
>>>  tools/patman/series.py    | 4 +++-
>>>  2 files changed, 8 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/tools/buildman/control.py b/tools/buildman/control.py
>>> index 8d7b9b5..1ce8b6f 100644
>>> --- a/tools/buildman/control.py
>>> +++ b/tools/buildman/control.py
>>> @@ -137,6 +137,11 @@ def DoBuildman(options, args):
>>>      upstream_commit = gitutil.GetUpstream(options.git_dir, options.branch)
>>>      series = patchstream.GetMetaDataForList(upstream_commit, options.git_dir,
>>>              1)
>>> +    # Conflicting tags are not a problem for buildman, since it does not use
>>> +    # then. For example, Series-version is not useful for buildman. On the
>>
>> s/then/them/
>>
>> Feel free to fix in-line and pull request.
>>
>> Reviewed-by: Tom Rini <trini at ti.com>
>
> OK, will do.

Fixed typo, and:

Applied to x86/patman.