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

Re: diff3 on OpenBSD 2.9

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2002-03-20 17:32:13 CET

On Wed, 2002-03-20 at 11:05, Johan Lindh wrote:
> (If the XXX appears at the end of line 10, then your diff3 does not
> add a spurious newline. But if the XXX appears on its own line, then
> diff3 added a newline not present in any of the original data; in
> which case, please mail dev@subversion.tigris.org stating your
> operating system and the output of 'diff3 --version'.)

Hm. The user obviously reversed the sense of this paragraph, but that's
going to happen a lot. What made this message appear in the first
place?

Also, I feel like my voice is getting lost in the wind here. Let me try
again with caps lock on:

  THE VERSION OF DIFF3 DOES NOT MATTER. DIFF3 INVOKES DIFF. THE
  PROBLEM IS WITH THE HACKED DIFF COMMAND ON FREEBSD.

Installing a stock gnu diffutils solves the problem (and is the right
answer) because the freshly installed diff3 will invoke the freshly
installed (unhacked) gnu diff. But apart from that, you're still
getting the same diff3.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 20 17:33:01 2002

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