You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Julian Foad <ju...@wandisco.com> on 2010/11/17 12:04:21 UTC
The new "warning: The depth of this commit is 'empty', but copied
dirs ..."
Today I committed the result of a merge, which included mergeinfo change
on ".", but I didn't want to include a file that I have locally modified
for testing purposes, so I explicitly specified "." and the required
target file.
[[[
svn commit -N -m "..." . subversion/mod_dav_svn/mirror.c
svn: warning: The depth of this commit is 'empty', but copied
directories will regardless be committed with depth 'infinity'. You must
remove unwanted children of those directories in a separate commit.
Sending .
Sending subversion/mod_dav_svn/mirror.c
Transmitting file data .
Committed revision 1035992.
]]]
I think it would be better if we only issue this warning when the
proposed commit does in fact include a copy, otherwise it's going to be
too much noise.
Thoughts?
- Julian
Re: The new "warning: The depth of this commit is 'empty', but
copied dirs ..."
Posted by Julian Foad <ju...@wandisco.com>.
On Wed, 2010-11-17, Stefan Sperling wrote:
> On Wed, Nov 17, 2010 at 12:04:21PM +0000, Julian Foad wrote:
> > I think it would be better if we only issue this warning when the
> > proposed commit does in fact include a copy, otherwise it's going to be
> > too much noise.
> >
> > Thoughts?
>
> The warning is printed very early in the commit process, way before
> the commit targets are harvested. Printing the warning at a later stage
> is much harder to do, especially in light of backporting the change
> to 1.6.x because that would require API changes (the backport has
> happened in 1.6.13).
>
> But yes, I agree that it would be better to print the warning only
> if the commit harvester has actually picked up a copy. We could file
> an issue with 1.7.0 milestone for this, and I'll try to take a crack
> at it if I can find the time.
Great, thanks. Issue #3752
<http://subversion.tigris.org/issues/show_bug.cgi?id=3752>, "Warning
about committing copied dir at depth 'empty'". I won't hold you to
working on it, of course.
- Julian
Re: The new "warning: The depth of this commit is 'empty', but
copied dirs ..."
Posted by Stefan Sperling <st...@elego.de>.
On Wed, Nov 17, 2010 at 12:04:21PM +0000, Julian Foad wrote:
> Today I committed the result of a merge, which included mergeinfo change
> on ".", but I didn't want to include a file that I have locally modified
> for testing purposes, so I explicitly specified "." and the required
> target file.
>
> [[[
> svn commit -N -m "..." . subversion/mod_dav_svn/mirror.c
> svn: warning: The depth of this commit is 'empty', but copied
> directories will regardless be committed with depth 'infinity'. You must
> remove unwanted children of those directories in a separate commit.
> Sending .
> Sending subversion/mod_dav_svn/mirror.c
> Transmitting file data .
> Committed revision 1035992.
> ]]]
>
> I think it would be better if we only issue this warning when the
> proposed commit does in fact include a copy, otherwise it's going to be
> too much noise.
>
> Thoughts?
The warning is printed very early in the commit process, way before
the commit targets are harvested. Printing the warning at a later stage
is much harder to do, especially in light of backporting the change
to 1.6.x because that would require API changes (the backport has
happened in 1.6.13).
But yes, I agree that it would be better to print the warning only
if the commit harvester has actually picked up a copy. We could file
an issue with 1.7.0 milestone for this, and I'll try to take a crack
at it if I can find the time.
Stefan