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

Re: Using --diff-cmd=/usr/bin/diff3 says merGed but is Conflict

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2005-10-12 09:53:11 CEST

Ping!

No reaction on users@, so forwarding to dev@.

On 9/16/05, Erik Enge <eenge@prium.net> wrote:
> Subversion version 1.2.3 on RedHat Linux 7.2 using diff3 version 2.7.2.
>
> I have specified that it should use the external diff3 by setting
> the diff3_cmd setting in the site-wide configuration file and it's
> picking up on this setting. During a three-way diff, Subversion
> reports the file as merGed but diff3 puts the .mine, .revNEW,
> .revOLD files on the filesystem and it also merges the conflict
> markers into the file I updated (detailed information can be
> provided if needed). I was tracing this in Subversion's
> sourcecode and from what I can tell, here's what's happening:
>
> Subversion makes two runs to libsvn_wc/merge.c's svn_wc_merge() during
> the update. During the first, dry_run is 1, during the
> second, it is 0. My problem is that during the dry run
> Subversion uses its internal diff3 (which is producing the
> merGe'd state) and during the second phase it's using the
> external diff3 utility which is telling me this is a Conflict.
>
> Have I run into a bug or have I misconfigured Subversion in some way?
> Let me know if there's any other information I can provide to make
> it easier to answer this question.
>
> Thanks for any pointers,
> Erik.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
Received on Wed Oct 12 10:00:13 2005

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