Re: [Wireshark-commits] rev 38800: /trunk/ /trunk/epan/crc/: Makefile.am Makefile.common Makefile.nmake crc-16-plain.c crc-16-plain.h /trunk/epan/crypt/: airpdcap.c airpdcap_wep.c /trunk/epan/dissectors/: packet-assa_r3.c ...

[Bill Meier <wmeier () newsguy com>]

On 8/30/2011 12:01 PM, Stephen Fisher wrote:
> On Tue, Aug 30, 2011 at 11:22:29AM -0400, Bill Meier wrote:
> > On 8/30/2011 11:14 AM, Bill Meier wrote:
>
> > > For instance: epan/crc/Makefile.nmake has missing history in SVN and
> > > has 2 copies of the body in the file.
>
> > Ditto for epan/crc
> >     Makefile.am
> >     Makefile.common
>
> After removing the directory and doing an "svn update" again, mine looks
> OK.  I see a (short) history for each of those three files, with the
> most recent being "Create the 1.6 trunk" (r37146) by Gerald.
> Makefile.nmake only has one copy of itself.

Interesting...

Deleting epan/crc and doing an svn update didn't work for me (in a 
different Wireshark tree than the one in which I did the svn merge 
described in a previous EMail).


Also: The fact remains that anonsvn shows messed up versions of the
Makefile.nmake & etc files (at least when I view same)


http://anonsvn.wireshark.org/viewvc/trunk/epan/crc/Makefile.nmake?revision=38803&view=markup&sortby=date


Am I missing something??

Bill

___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
            mailto:wireshark-dev-request () wireshark org?subject=unsubscribe