Comment 4 for bug 385667

Revision history for this message
Muharem Hrnjadovic (al-maisan) wrote : Re: [Bug 385667] Re: merge-upstream in an empty branch is odd

James Westby wrote:
> On Sat Sep 19 06:06:04 UTC 2009 Muharem Hrnjadovic wrote:
>> re. "it removes any .bzrignore":
>>
>> I did not find anything specific to merge-upstream that removes
>> .bzrignore files. This is rather a general filter feature of imports
>> (see import_dsc.import_archive() and should_ignore() for more detail).
>>
>> Is this still to be considered buggy behaviour? I guess not.
>
> I think it is. I am not sure we should be removing .bzrignore
> at any time, but I think certainly not in merge-upstream with
> a tarball and a branch.

Hello James,

thank you very much for commenting on this. I have disabled the
filtering of ".bzrignore" files altogether (please see the enclosed
incremental diff).

Should you want to disable ".bzrignore" filtering for merge-upstream
operations specifically, please let me know.

Best regards

--
Muharem Hrnjadovic <email address hidden>
Public key id : B2BBFCFC
Key fingerprint : A5A3 CC67 2B87 D641 103F 5602 219F 6B60 B2BB FCFC