You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Marc Strapetz <ma...@syntevo.com> on 2015/04/22 19:58:35 UTC
Subversion 1.9: svn cp --pin-externals may produce dummy log entries
After invoking following series of commands:
svnadmin create repo
svn checkout file://localhost/d:/temp/externals/repo wc
mkdir wc
cd wc
mkdir ext
touch ext\file
mkdir src\dir
svn add *
svn propset svn:externals "^/ext ext" src
svn propset svn:externals "^/ext@1 ext" src\dir
svn commit -m "initial import"
svn up
svn cp --pin-externals src ^^/dst -m "copy"
svn log -r2 -v
svn proplist -r2 -R -v ^^/
svn proplist -r1 -R -v ^^/
The final log output shows /dst/dir as modified:
-------------------------
r2 | marc | 2015-04-22...
Changed paths:
A /dst (from /src:1)
M /dst/dir
copy
-------------------------
However, there is no modification expected, because src\dir external
already has a revision number set. The proplist outputs confirm that the
property hasn't been modified:
$ svn proplist -r2 -R -v ^/
...
Properties on 'file://localhost/D:/temp/externals/repo/dst/dir':
svn:externals
^/ext@1 ext
$ svn proplist -r1 -R -v ^/
...
Properties on 'file://localhost/D:/temp/externals/repo/src/dir':
svn:externals
^/ext@1 ext
-Marc
Re: Subversion 1.9: svn cp --pin-externals may produce dummy
logentries
Posted by Stefan Sperling <st...@elego.de>.
On Thu, Apr 23, 2015 at 05:46:29PM +0100, Julian Foad wrote:
> Bert Huijben wrote:
> > I don't think this is really a noop change. Most likely svnadmin dump will
> > show that it recorded a change on the fs layer.
> >
> > The replay API (such as used by svnsync and svnrdump) probably won't show a
> > change.
>
> Erm... but that's basically what 'no-op change' means, to me: when a
> 'change' is noted at the FS layer (and seen in a dump) but the 'after'
> content is the same as the 'before' content, and no change is reported
> by 'replay' and similar higher level APIs.
>
> The 'content' concerned could in principle be file text, properties,
> directory entries, or any combination. In practice usually we see an
> issue either with file text or with properties.
>
> - Julian
Should be fixed as of http://svn.apache.org/r1676538
Re: Subversion 1.9: svn cp --pin-externals may produce dummy logentries
Posted by Julian Foad <ju...@btopenworld.com>.
Bert Huijben wrote:
> I don't think this is really a noop change. Most likely svnadmin dump will
> show that it recorded a change on the fs layer.
>
> The replay API (such as used by svnsync and svnrdump) probably won't show a
> change.
Erm... but that's basically what 'no-op change' means, to me: when a
'change' is noted at the FS layer (and seen in a dump) but the 'after'
content is the same as the 'before' content, and no change is reported
by 'replay' and similar higher level APIs.
The 'content' concerned could in principle be file text, properties,
directory entries, or any combination. In practice usually we see an
issue either with file text or with properties.
- Julian
RE: Subversion 1.9: svn cp --pin-externals may produce dummy
logentries
Posted by Bert Huijben <be...@qqmail.nl>.
I don't think this is really a noop change. Most likely svnadmin dump will show that it recorded a change on the fs layer.
The replay API (such as used by svnsync and svnrdump) probably won't show a change.
Bert
-----Original Message-----
From: "Stefan Sperling" <st...@elego.de>
Sent: 23-4-2015 11:27
To: "Marc Strapetz" <ma...@syntevo.com>
Cc: "dev@subversion.apache.org" <de...@subversion.apache.org>
Subject: Re: Subversion 1.9: svn cp --pin-externals may produce dummy logentries
On Wed, Apr 22, 2015 at 07:58:35PM +0200, Marc Strapetz wrote:
> After invoking following series of commands:
>
> svnadmin create repo
> svn checkout file://localhost/d:/temp/externals/repo wc
>
> mkdir wc
> cd wc
> mkdir ext
> touch ext\file
>
> mkdir src\dir
> svn add *
> svn propset svn:externals "^/ext ext" src
> svn propset svn:externals "^/ext@1 ext" src\dir
> svn commit -m "initial import"
>
> svn up
> svn cp --pin-externals src ^^/dst -m "copy"
> svn log -r2 -v
> svn proplist -r2 -R -v ^^/
> svn proplist -r1 -R -v ^^/
>
> The final log output shows /dst/dir as modified:
>
> -------------------------
> r2 | marc | 2015-04-22...
> Changed paths:
> A /dst (from /src:1)
> M /dst/dir
>
> copy
> -------------------------
>
> However, there is no modification expected, because src\dir external already
> has a revision number set. The proplist outputs confirm that the property
> hasn't been modified:
Interesting. I suspect this comes about because the pin-externals code
always sends a propchange in the commit transaction. Apparently the
repository will happily record a no-op change. It seems the client
should avoid sending a propchange with an empty delta?
Or should the server be fixed to collapse empty propchanges to nothing?
What does it do for no-op file content changes sent by clients?
In any case, this is a cosmetic issue in practice. But I agree it should
be fixed.
> $ svn proplist -r2 -R -v ^/
> ...
> Properties on 'file://localhost/D:/temp/externals/repo/dst/dir':
> svn:externals
> ^/ext@1 ext
>
>
> $ svn proplist -r1 -R -v ^/
> ...
> Properties on 'file://localhost/D:/temp/externals/repo/src/dir':
> svn:externals
> ^/ext@1 ext
To rule out whitespace differences, can you please send these outputs
through hexdump or diff to ensure they really are identical?
I believe they are, just checking.
Re: Subversion 1.9: svn cp --pin-externals may produce dummy log entries
Posted by Julian Foad <ju...@btopenworld.com>.
Stefan Sperling wrote:
> Marc Strapetz wrote:
>> Changed paths:
>> A /dst (from /src:1)
>> M /dst/dir
[...]
>> However, there is no modification expected, [...]
>
> Interesting. I suspect this comes about because the pin-externals code
> always sends a propchange in the commit transaction. Apparently the
> repository will happily record a no-op change. It seems the client
> should avoid sending a propchange with an empty delta?
Yes, that's the rule currently: the client should avoid sending an empty change.
> Or should the server be fixed to collapse empty propchanges to nothing?
Longer term, the server should collapse empty changes to nothing.
> What does it do for no-op file content changes sent by clients?
More or less the same as for properties. (But the handling isn't consistent.)
> In any case, this is a cosmetic issue in practice. But I agree it should
> be fixed.
Agreed.
- Julian
Re: Subversion 1.9: svn cp --pin-externals may produce dummy log
entries
Posted by Branko Čibej <br...@wandisco.com>.
On 23.04.2015 11:27, Stefan Sperling wrote:
> On Wed, Apr 22, 2015 at 07:58:35PM +0200, Marc Strapetz wrote:
>> After invoking following series of commands:
>>
>> svnadmin create repo
>> svn checkout file://localhost/d:/temp/externals/repo wc
>>
>> mkdir wc
>> cd wc
>> mkdir ext
>> touch ext\file
>>
>> mkdir src\dir
>> svn add *
>> svn propset svn:externals "^/ext ext" src
>> svn propset svn:externals "^/ext@1 ext" src\dir
>> svn commit -m "initial import"
>>
>> svn up
>> svn cp --pin-externals src ^^/dst -m "copy"
>> svn log -r2 -v
>> svn proplist -r2 -R -v ^^/
>> svn proplist -r1 -R -v ^^/
>>
>> The final log output shows /dst/dir as modified:
>>
>> -------------------------
>> r2 | marc | 2015-04-22...
>> Changed paths:
>> A /dst (from /src:1)
>> M /dst/dir
>>
>> copy
>> -------------------------
>>
>> However, there is no modification expected, because src\dir external already
>> has a revision number set. The proplist outputs confirm that the property
>> hasn't been modified:
> Interesting. I suspect this comes about because the pin-externals code
> always sends a propchange in the commit transaction. Apparently the
> repository will happily record a no-op change. It seems the client
> should avoid sending a propchange with an empty delta?
>
> Or should the server be fixed to collapse empty propchanges to nothing?
> What does it do for no-op file content changes sent by clients?
We've always supported no-op changes in the repository. As far as this
is even an issue, it's a client-side thing.
> In any case, this is a cosmetic issue in practice. But I agree it should
> be fixed.
Yes, the pinning code should avoid no-op propchanges.
-- Brane
>
>> $ svn proplist -r2 -R -v ^/
>> ...
>> Properties on 'file://localhost/D:/temp/externals/repo/dst/dir':
>> svn:externals
>> ^/ext@1 ext
>>
>>
>> $ svn proplist -r1 -R -v ^/
>> ...
>> Properties on 'file://localhost/D:/temp/externals/repo/src/dir':
>> svn:externals
>> ^/ext@1 ext
> To rule out whitespace differences, can you please send these outputs
> through hexdump or diff to ensure they really are identical?
> I believe they are, just checking.
Re: Subversion 1.9: svn cp --pin-externals may produce dummy log
entries
Posted by Marc Strapetz <ma...@syntevo.com>.
On 23.04.2015 11:27, Stefan Sperling wrote:
> On Wed, Apr 22, 2015 at 07:58:35PM +0200, Marc Strapetz wrote:
>> $ svn proplist -r2 -R -v ^/
>> ...
>> Properties on 'file://localhost/D:/temp/externals/repo/dst/dir':
>> svn:externals
>> ^/ext@1 ext
>>
>>
>> $ svn proplist -r1 -R -v ^/
>> ...
>> Properties on 'file://localhost/D:/temp/externals/repo/src/dir':
>> svn:externals
>> ^/ext@1 ext
>
> To rule out whitespace differences, can you please send these outputs
> through hexdump or diff to ensure they really are identical?
> I believe they are, just checking.
The contents seem to be actually identical:
$ svn proplist -r2 -R -v ^/ > hexdump
...
0A 20 20 20 20 0D 0A 50 - 72 6F 70 65 72 74 69 65 | Propertie|
73 20 6F 6E 20 27 66 69 - 6C 65 3A 2F 2F 6C 6F 63 |s on 'file://loc|
61 6C 68 6F 73 74 2F 44 - 3A 2F 74 65 6D 70 2F 65 |alhost/D:/temp/e|
78 74 65 72 6E 61 6C 73 - 2F 72 65 70 6F 2F 64 73 |xternals/repo/ds|
74 2F 64 69 72 27 3A 0D - 0A 20 20 73 76 6E 3A 65 |t/dir': svn:e|
78 74 65 72 6E 61 6C 73 - 0D 0A 20 20 20 20 5E 2F |xternals ^/|
65 78 74 40 31 20 65 78 - 74 0D 0D 0A 20 20 20 20 |ext@1 ext |
0D 0A - | |
$ svn proplist -r1 -R -v ^/
...
20 20 20 0D 0A 50 72 6F - 70 65 72 74 69 65 73 20 | Properties |
6F 6E 20 27 66 69 6C 65 - 3A 2F 2F 6C 6F 63 61 6C |on 'file://local|
68 6F 73 74 2F 44 3A 2F - 74 65 6D 70 2F 65 78 74 |host/D:/temp/ext|
65 72 6E 61 6C 73 2F 72 - 65 70 6F 2F 73 72 63 2F |ernals/repo/src/|
64 69 72 27 3A 0D 0A 20 - 20 73 76 6E 3A 65 78 74 |dir': svn:ext|
65 72 6E 61 6C 73 0D 0A - 20 20 20 20 5E 2F 65 78 |ernals ^/ex|
74 40 31 20 65 78 74 0D - 0D 0A 20 20 20 20 0D 0A |t@1 ext |
-Marc
Re: Subversion 1.9: svn cp --pin-externals may produce dummy log
entries
Posted by Stefan Sperling <st...@elego.de>.
On Wed, Apr 22, 2015 at 07:58:35PM +0200, Marc Strapetz wrote:
> After invoking following series of commands:
>
> svnadmin create repo
> svn checkout file://localhost/d:/temp/externals/repo wc
>
> mkdir wc
> cd wc
> mkdir ext
> touch ext\file
>
> mkdir src\dir
> svn add *
> svn propset svn:externals "^/ext ext" src
> svn propset svn:externals "^/ext@1 ext" src\dir
> svn commit -m "initial import"
>
> svn up
> svn cp --pin-externals src ^^/dst -m "copy"
> svn log -r2 -v
> svn proplist -r2 -R -v ^^/
> svn proplist -r1 -R -v ^^/
>
> The final log output shows /dst/dir as modified:
>
> -------------------------
> r2 | marc | 2015-04-22...
> Changed paths:
> A /dst (from /src:1)
> M /dst/dir
>
> copy
> -------------------------
>
> However, there is no modification expected, because src\dir external already
> has a revision number set. The proplist outputs confirm that the property
> hasn't been modified:
Interesting. I suspect this comes about because the pin-externals code
always sends a propchange in the commit transaction. Apparently the
repository will happily record a no-op change. It seems the client
should avoid sending a propchange with an empty delta?
Or should the server be fixed to collapse empty propchanges to nothing?
What does it do for no-op file content changes sent by clients?
In any case, this is a cosmetic issue in practice. But I agree it should
be fixed.
> $ svn proplist -r2 -R -v ^/
> ...
> Properties on 'file://localhost/D:/temp/externals/repo/dst/dir':
> svn:externals
> ^/ext@1 ext
>
>
> $ svn proplist -r1 -R -v ^/
> ...
> Properties on 'file://localhost/D:/temp/externals/repo/src/dir':
> svn:externals
> ^/ext@1 ext
To rule out whitespace differences, can you please send these outputs
through hexdump or diff to ensure they really are identical?
I believe they are, just checking.