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

On 3/7/07, Joe Coder <coderdude2@yahoo.com> wrote:
> Hi,
>
> Using subversion 1.4.3 self-compiled on Slackware Linux 2.6.17.13-smp.
>
> 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:
>
> </rsp>
>
> New file contents, as checked in:
>
> </rsp>
> <?php ob_flush(); ?>
>
> After svn update on a different machine, the file was updated as follows:
>
> </rsp>
> <<<<<<< .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.

That isn't "diff junk", those are conflict markers which indicate that
changes which conflict with your WC weren't able to be merged upon
update. If you run svn st, you should see that file marked with a
status of C.

If you look at the copy in the repository, you'll find those markers
aren't there.

Your next task is to resolve the conflict, inform the WC that it's
resolved, and then commit.

See http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html#svn.tour.cycle.resolve

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 7 17:01:42 2007