You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Philip Martin <ph...@codematters.co.uk> on 2001/12/17 23:22:36 UTC
Re: svn commit: rev 660 - trunk trunk/subversion/include trunk/subversion/libsvn_wc trunk/subversion/libsvn_client trunk/subversion/clients/cmdline trunk/subversion/tests/clients/cmdline
philip@tigris.org writes:
> Author: philip
> Date: 2001-12-17 23:10 GMT
> New Revision: 660
>
> Added:
> trunk/subversion/libsvn_wc/diff.c
> trunk/subversion/tests/clients/cmdline/diff_tests.py
> Modified:
> trunk/build.conf
> trunk/subversion/clients/cmdline/diff-cmd.c
> trunk/subversion/clients/cmdline/main.c
> trunk/subversion/include/svn_client.h
> trunk/subversion/include/svn_wc.h
> trunk/subversion/libsvn_client/diff.c
> trunk/subversion/libsvn_wc/adm_files.c
> trunk/subversion/libsvn_wc/wc.h
> Log:
> Provides 'svn diff -r REV' functionality to compare the working copy
> against a given revision in the repository. The existing 'svn diff'
> behaviour is unchanged.
Just a quick summary:
$ svn diff
works as before, but
$ svn diff -r REV
compares your working copy against the repository. This includes
showing diffs for files that have been added and removed. If you check
out a new working copy there will be an additional empty file in the
admin area that is used for add/remove diffs. This doesn't exist in
any current working copies but can be added as follows:
$ cd <some working copy>
$ find . -name \\.svn -type d -exec echo touch {}/empty-file \;
which will produce echo a series of touch commands. If those look
sensible then without the echo
$ find . -name \\.svn -type d -exec touch {}/empty-file \;
will create the files. You do not *need* to do this, it is only
necessary if you want to diff added or removed files.
--
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 660 - trunk trunk/subversion/include trunk/subversion/libsvn_wc trunk/subversion/libsvn_client trunk/subversion/clients/cmdline trunk/subversion/tests/clients/cmdline
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On Mon, Dec 17, 2001 at 05:47:29PM -0600, Karl Fogel wrote:
> Philip Martin <ph...@codematters.co.uk> writes:
> > > Provides 'svn diff -r REV' functionality to compare the working copy
> > > against a given revision in the repository. The existing 'svn diff'
> > > behaviour is unchanged.
> >
> > Just a quick summary:
> >
> > $ svn diff
> >
> > works as before, but
> >
> > $ svn diff -r REV
> >
> > compares your working copy against the repository. This includes
> > showing diffs for files that have been added and removed. If you check
> > out a new working copy there will be an additional empty file in the
> > admin area that is used for add/remove diffs. This doesn't exist in
> > any current working copies but can be added as follows:
> >
> > $ cd <some working copy>
> > $ find . -name \\.svn -type d -exec echo touch {}/empty-file \;
> >
> > which will produce echo a series of touch commands. If those look
> > sensible then without the echo
> >
> > $ find . -name \\.svn -type d -exec touch {}/empty-file \;
> >
> > will create the files. You do not *need* to do this, it is only
> > necessary if you want to diff added or removed files.
i had to escape the { and } to make that command work. (perhaps because
i'm using tcsh)
$ find . -name \\.svn -type d -exec touch \{\}/empty-file \;
-garrett
--
garrett rooney Unix was not designed to stop you from
rooneg@electricjellyfish.net doing stupid things, because that would
http://electricjellyfish.net/ stop you from doing clever things.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 660 - trunk trunk/subversion/include trunk/subversion/libsvn_wc trunk/subversion/libsvn_client trunk/subversion/clients/cmdline trunk/subversion/tests/clients/cmdline
Posted by Karl Fogel <kf...@newton.ch.collab.net>.
Philip Martin <ph...@codematters.co.uk> writes:
> > Provides 'svn diff -r REV' functionality to compare the working copy
> > against a given revision in the repository. The existing 'svn diff'
> > behaviour is unchanged.
>
> Just a quick summary:
>
> $ svn diff
>
> works as before, but
>
> $ svn diff -r REV
>
> compares your working copy against the repository. This includes
> showing diffs for files that have been added and removed. If you check
> out a new working copy there will be an additional empty file in the
> admin area that is used for add/remove diffs. This doesn't exist in
> any current working copies but can be added as follows:
>
> $ cd <some working copy>
> $ find . -name \\.svn -type d -exec echo touch {}/empty-file \;
>
> which will produce echo a series of touch commands. If those look
> sensible then without the echo
>
> $ find . -name \\.svn -type d -exec touch {}/empty-file \;
>
> will create the files. You do not *need* to do this, it is only
> necessary if you want to diff added or removed files.
Okay, that sounds fine; ignore the "run-time upgrade" suggestion in my
earlier email, then.
Still would like a way of doing this that doesn't involve empty
files, hmmm...
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org