[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

SVN 1.4.3 Bug? - svn update added "diff junk" to one of the files being updated

From: Joe Coder <coderdude2_at_yahoo.com>
Date: 2007-03-07 15:53:44 CET


Using subversion 1.4.3 self-compiled on Slackware Linux

A file was modified and checked in, and then I wanted to do an update on the same file on a different machine.

Original file contents:


New file contents, as checked in:

<?php ob_flush(); ?>

After svn update on a different machine, the file was updated as follows:

<<<<<<< .mine
<?php ob_flush(); ?>
<?php ob_flush(); ?>>>>>>>> .r163

So for whatever reason, this "diff junk" was actually added to the file
when it was updated, and I had to manually fix the file.

To my knowledge this has only happened once so far, haven't see it
before during previous use of svn on this machine and other Linux
and Windows machines.


Expecting? Get great news right away with email Auto-Check.
Try the Yahoo! Mail Beta.
Received on Wed Mar 7 16:54:19 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.