Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] rev 38800: /trunk/ /trunk/epan/crc/: Mak

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Bill Meier <wmeier@xxxxxxxxxxx>
Date: Tue, 30 Aug 2011 12:16:22 -0400
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