[Paraview-developers] ppebay - please backout your recent changes to filters.xml and Filters.xml

[William A. Hoffman]

CVS will not let you check in a file if it is not up-to-date.
The only way this can happen, is if you do an update, then copy
a file over the updated file, then commit.   So, the rule should
be please do not copy files into a cvs tree from somewhere else.

-Bill


At 11:55 PM 4/23/2006, Philippe P. Pebay wrote:
>Hi
>
>Thanks for letting me know. However, I did update -- so I don't know what went wrong. I'm going to fix this right now. My apologies for the inconvenience.
>
>Philippe
>
>David E DeMarle wrote:
>>Hello,
>>I think you forgot to update before you commited. You've undone revisions 1.105 through 1.110 when you commited filters.xml 1.111, and 1.168 through 1.173 when you committed 1.174.
>>To fix, do this:
>> > cvs diff -u -r 1.111 -r 1.110 Server/ServerManager/filters.xml > patch1
>> > patch -p0 < patch1
>> > cvs diff -u -r 1.174 -r 1.173 GUI/Client/Resources/Filters.xml > patch2
>> > patch -p0 < patch2
>>Apply the changes you wanted to make to the resulting files then.
>> > make
>> > test
>> > cvs update
>> > cvs commit
>>Just a reminder everyone, please cvs update before you cvs commit.
>>cheers
>>Dave DeMarle
>>
>>
>>_______________________________________________
>>Paraview-developers mailing list
>>Paraview-developers at paraview.org
>>http://public.kitware.com/mailman/listinfo/paraview-developers
>>
>
>_______________________________________________
>Paraview-developers mailing list
>Paraview-developers at paraview.org
>http://public.kitware.com/mailman/listinfo/paraview-developers