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

David E DeMarle dave.demarle at kitware.com
Sun Apr 23 17:36:05 EDT 2006


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







More information about the Paraview-developers mailing list