RE: [MERGE] Squid Patch (revision 10487)

On Wed, 19 May 2010 10:03:11 -0500, <senad.cimic_at_thomsonreuters.com>
wrote:
> Not sure what went wrong, but since changes in each of the 3 files are
> minimal I included differences as attachments (new version for each file
is
> on top, old version is on bottom):
>
> neighbor.cc_diff.jpg - shows changes in neighbor.cc file in the
> peerAllowedToUse method.
> structs.h_diff.jpg - shows a single variable that has been added to
onoff
> struct in the structs.h file.
> cf.data.pre_diff.jpg - shows info that has been added for a new
> access_sibling_for_stale_resource directive in cf.data.pre.
>

Okay. Thats more readable at least.
+1 provided this has some testing behind it.

> Let me know what you think. I can try couple different things with
Bazaar
> to generate correct patch file if needed.

Not sure beyond the ones I use daily
...to see unsaved changes:
    bzr diff

...to see changes in a branch back to its parent (ie trunk):
   bzr diff -rsubmit:

I suspect there might be something like whitespacing or \n \r differences
in your OS or editor from the stored type the rest of us use.

Are you using Eclipse or Emacs for an editor? they are known to change
end-of-line characters by default sometimes.

Amos

>
> Thanks in advance,
> Senad
>
> -----Original Message-----
> From: Amos Jeffries [mailto:squid3_at_treenet.co.nz]
> Sent: Tuesday, May 18, 2010 6:55 PM
> To: squid-dev_at_squid-cache.org
> Subject: Re: [MERGE] Squid Patch (revision 10487)
>
> On Tue, 18 May 2010 16:25:31 -0500, <senad.cimic_at_thomsonreuters.com>
> wrote:
>> Attached file is generated patch for the issue where squid does not
>> contact its siblings for the stale resources. New directive has been
>> added to make this behavior optional.
>>
>> Let me know if any issues.
>
> Something has gone wrong in the patch creation or formatting process.
Each
> file that you have altered even slightly is removed completely and
replaced
> with a whole new version. This makes it extremely hard to tell what
changes
> you have made.
>
> Amos
Received on Thu May 20 2010 - 00:47:24 MDT