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

Re: Diff, ignore & deleted files

From: Christer J. <christer.nyfalt_at_welho.com>
Date: 2005-07-03 19:54:42 CEST

On Sun, 2005-07-03 at 11:08 -0600, Bob Proulx wrote:
> Christer J. Nyfält wrote:
> > - I ran svn diff and noticed that diff was very long and full of changes
> > concerning Makefile.in files that I rather not see.
> > - I decided to delete all Makefile.in files from the repository,
> > svn:ignore them and rebuild them.
>
> By what exact method did you use to delete those files? I believe
> your problem lies in those details.
>
svn delete Makefile.in
svn commit
automake
svn propedit svn:ignore <dir>
[Added files to hide]
svn commit

> > An here comes the problem:
> > The files deleted from the repository and ignored still clutter the diff
> > if I compare with the original version. I could use --no-diff-deleted,
> > but there will be occasions when I want to see other deleted files and
> > old hide the ignored ones.
> >
old->only

> > So is there a way to solve this currently or should I file an issue
> > request for adding a --no-diff-ignored flag for svn diff?
>
> If they were really deleted then you would not see them in your diff
> and they would not show up as an M in the status. Because you are
> seeing them in your diff I believe you have not really deleted them.
>
It seems that I was unclear.
I have no problems with svn stat and plain svn diff.
The problem comes when I run svn diff -r 6, where 6 is the revision
number of the imported sources that I want to compare with when I
generate patches. Now I either get a lot of junk or the problem that
--no-diff-deleted hides too much.
BTW, is there a way to also hide Property changes in diff output?

-- 
Christer J. Nyfält <christer.nyfalt@welho.com>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jul 3 19:58:15 2005

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