You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Ben Collins-Sussman <su...@collab.net> on 2002/11/17 03:30:47 UTC
svn diff URL URL weirdness
Just for kicks, try comparing the HEAD of two branches:
svn diff http://svn.collab.net/repos/svn/trunk/subversion/mod_dav_svn \
http://svn.collab.net/repos/svn/branches/autoversion/subversion/mod_dav_svn
Only one file should differ between these branches, yet I see the
output below. Is this a bug?
Index: mod_dav_svn.c
===================================================================
Index: merge.c
===================================================================
Index: deadprops.c
===================================================================
Index: log.c
===================================================================
Index: update.c
===================================================================
Index: liveprops.c
===================================================================
Index: mod_dav_svn.dsp
===================================================================
Index: dav_svn.h
===================================================================
Index: version.c
===================================================================
--- version.c (revision 3812)
+++ version.c (revision 3812)
@@ -116,6 +116,12 @@
if (resource->baselined && resource->type == DAV_RESOURCE_TYPE_VERSION)
return DAV_AUTO_VERSION_ALWAYS;
+ /* ### We also want to allow TYPE_REGULAR VCR's to be
+ auto-versionable. But we can't start returning ALWAYS here until
+ we implement new routines below. In particular, mod_dav starts
+ trying to call our version_control() routine, which doesn't yet
+ exist, and then the whole request throws an error. */
+
[...]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn diff URL URL weirdness
Posted by Philip Martin <ph...@codematters.co.uk>.
Ben Collins-Sussman <su...@collab.net> writes:
> Just for kicks, try comparing the HEAD of two branches:
>
> svn diff http://svn.collab.net/repos/svn/trunk/subversion/mod_dav_svn \
> http://svn.collab.net/repos/svn/branches/autoversion/subversion/mod_dav_svn
>
> Only one file should differ between these branches, yet I see the
> output below. Is this a bug?
Perhaps :)
Those empty diffs tell you that the files exist as two separate
repository revisions, and they just happen to have the same contents.
Is that useful information? I argue that it is. Should it be the
default form for the output? I don't know.
> Index: mod_dav_svn.c
> ===================================================================
> Index: merge.c
> ===================================================================
> Index: deadprops.c
> ===================================================================
> Index: log.c
> ===================================================================
> Index: update.c
> ===================================================================
> Index: liveprops.c
> ===================================================================
> Index: mod_dav_svn.dsp
> ===================================================================
> Index: dav_svn.h
> ===================================================================
> Index: version.c
> ===================================================================
> --- version.c (revision 3812)
> +++ version.c (revision 3812)
Now this is a bug. We ought to have some indication of which file is
which, two identical filenames and revisions is not much help!
> @@ -116,6 +116,12 @@
> if (resource->baselined && resource->type == DAV_RESOURCE_TYPE_VERSION)
> return DAV_AUTO_VERSION_ALWAYS;
>
> + /* ### We also want to allow TYPE_REGULAR VCR's to be
> + auto-versionable. But we can't start returning ALWAYS here until
> + we implement new routines below. In particular, mod_dav starts
> + trying to call our version_control() routine, which doesn't yet
> + exist, and then the whole request throws an error. */
> +
> [...]
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org