On Sun, 23 Jul 2006, martin f krafft wrote:
>   > # Automatically generated email from bts, devscripts version 2.9.20
>   > merge 376106 174331
>   Bug#174331: logcheck: propose support for macros in configs
>   Bug#376106: idea: interpolation in filter files
>   Mismatch - only Bugs in same state can be merged:
>   Values for `blocks' don't match:
>   #174331 has `306913';
>   #376106 has `'
> 
> is this really necessary? Could you not simply add the union of
> tags/blocks to the merged bug?

The union of the tags are already added to the merged bugs; blocks are
not merged currently because the union doesn't necessarily make sense.
IE, you need to make some decision on which blocks are correct, and
which aren't.

> I know about forcemerge and to be honest, the many times I have hit
> my head on this limitation will just make me use forcemerge at all
> times in the future, which I doubt is what I should be doing.

forcemerge is fine if you know that the first bug is correct, and you
want the second bug to be changed to be exactly the same as the first
bug. [Which may not always be the case, which is why merge is
stricter.]

> Please reasses. If I am merging two bugs and they are of the same
> severity and belong to the same package, I'd say their tags and
> blocks and whatever else should be added.

There may be an argument to have the union of blocks, but that's it;
the other non-tag/version fields definetly have to be the same in a
normal merge.


Don Armstrong

-- 
Clothes make the man. Naked people have little or no influence on
society.
 -- Mark Twain 

http://www.donarmstrong.com              http://rzlab.ucr.edu


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to