[wp-trac] Re: [WordPress Trac] #4831: Slugged by svn update; suspect wp-app.php version 5954

WordPress Trac wp-trac at lists.automattic.com
Tue Aug 28 08:47:25 GMT 2007


#4831: Slugged by svn update; suspect wp-app.php version 5954
----------------------+-----------------------------------------------------
 Reporter:  jcwinnie  |        Owner:  anonymous
     Type:  defect    |       Status:  closed   
 Priority:  normal    |    Milestone:           
Component:  General   |      Version:           
 Severity:  normal    |   Resolution:  invalid  
 Keywords:            |  
----------------------+-----------------------------------------------------
Comment (by westi):

 Note svn does funky things when it cannot merge your local changes with
 the changes incoming due to the svn up - this will leave you with extra
 files (.orig for example) and probably busted php script until you fix it.

 This is shown in the output of svn up I believe with a C in the output
 column (http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.update.html)

-- 
Ticket URL: <http://trac.wordpress.org/ticket/4831#comment:5>
WordPress Trac <http://trac.wordpress.org/>
WordPress blogging software


More information about the wp-trac mailing list