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

Re: svn diff, svn merge, and vendor branches (long)

From: Florin Iucha <florin_at_iucha.net>
Date: 2002-12-08 20:49:19 CET

On Sun, Dec 08, 2002 at 05:40:45PM +0000, Philip Martin wrote:
> Eric Gillespie <epg@pretzelnet.org> writes:
> > Diffing a and b with diff(1) produces a meaningful diff.
> > Diffing the two gnuserv.c versions with diff(1) or diffing with
> > svn when they share ancestry produces the meaningful diff,
> > diffing with svn they *don't* share ancestry produces a useless
> > diff.
> You keep repeating "useless". OK, I'll keep repeating "correct".

"One man's constant is another man's variable".

> Your "useless" result shows me that the files are not related? How is
> that useless?

Then why doesn't it say
   "ERROR 1005: The files are not related."
instead of spitting out both files with +/- on the first column,
scrolling out thirty pages of text?

It is usefull to know if one element is the ancestor of the other but
that is not the answer to my question: "What is the difference of the
contents of those two elements?"

Feel free to add a "is-ancestor-of" command.


"If it's not broken, let's fix it till it is."
41A9 2BDE 8E11 F1C5 87A6  03EE 34B3 E075 3B90 DFE4

  • application/pgp-signature attachment: stored
Received on Sun Dec 8 20:50:18 2002

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