Wireshark · Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] rev 38800: /trunk/ /trunk/epan/crc/: Makefile.am Makefile.co

[Gerald Combs <gerald@xxxxxxxxxxxxx>]

On 8/30/11 9:21 AM, Bill Meier wrote:
> On 8/30/2011 12:02 PM, Bill Meier wrote:
>> On 8/30/2011 11:22 AM, Bill Meier wrote:
>>> On 8/30/2011 11:14 AM, Bill Meier wrote:
>>>> On 8/30/2011 10:24 AM, Stig Bjørlykke wrote:
>>>>> I have reverted the crc move for now.
>>>>> I have to split the crc files into crc and crc_tvb routines, I think.
>>>>>
>>>>>
>>>>
>>>> I think something got messed up when the reversion was done...
>>>>
>>>> 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
>>>
>>> I havent't yet looked at any of the other files reverted.
>>>
>>> I suspect we should stop doing any other commits to SVN until this gets
>>> straightened out ....
>>>
>>
>>
>> I think the proper recovery is as follows:
>>
>>
>> svn merge -r38804:38799 . (in the top level directory).
>> svn commit (to the main repository)
>>
>> Doing the svn merge seems to have gotten my local copy back to the
>> correct files for 38799.
>>
>> However, Even if this is the correct way to go I'm certainly going to
>> leave doing the complete merge/update to Gerald (or someone who is
>> convinced that this is the correct recovery).
>>
> 
> Correction:
> 
>> leave doing the complete merge/commit to Gerald (or someone who is

I deleted epan/crc (r38805) and copied back the version from r38799
(r38806). This should revert the directory to its pre-deletion state,
including its log history.