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

`svn diff --svnpatch` doesn't print changes of properties in svnpatch block

From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA_at_GMail.Com>
Date: Sun, 8 Mar 2009 19:03:56 +0100

`svn diff --svnpatch` doesn't print changes of properties in svnpatch block
due to r35917. It is the main cause of failure of diff_tests.py 51
("test svnpatch format in various ways").

I'm attaching the reproduction script.
This script assumes that svnpatch.py is in PATH.

When this script is run with SVN/SVNADMIN variables pointing to executables
from Subversion trunk, then the last 2 lines of this script print the following
svnpatch:

========================= SVNPATCH1 BLOCK =========================
eJxlTssKwyAQ/BWP9hBIDD3EvynuBATJFrOX/n03xgRtEdZhHjtrDb+xDZlZjDXO02ge+uxJU8wK
F68/gnD+nA4dU7WFxDuqr6FLeo0Jip/+ANMVDa6LVlPhbVEOjZAgGLCJdl4rXHvfi6gvmO+CuVn0
W/Kv3bePHQ2KUr1fo6pMFg==

( open-root ( 2:d0 ) ) ( open-dir ( 9:directory 2:d0 2:d1 ) ) ( close-dir ( 2:d1 ) ) ( open-file ( 5:file1 2:d0 2:c2 ) ) ( close-file ( 2:c2 ( ) ) ) ( delete-entry ( 5:file2 2:d0 ) ) ( add-file ( 5:file3 2:d0 2:c3 ( ) ) ) ( close-file ( 2:c3 ( ) ) ) ( close-dir ( 2:d0 ) ) ( close-edit ( ) )

But if SVN/SVNADMIN variables point to executables from svnpatch-diff branch
r36390 (before merging r35917), then the last 2 lines of this script print
the following svnpach:

========================= SVNPATCH1 BLOCK =========================
eJxlkN0KwyAMhV/FS3dRqJYN5tuUJtsK0hSXDfr2iz+tbYegMTk5X1QrmnFqAhErrayDVl1k6ZyG
MUh4d3LiwBSWrJDNFNnw6qcnRmEzB5qzh5GWeMPAi5XUzX17/0GbelKXpzcW951ZYj5GjxJfXQzM
ChzsERiLlSjVSjSVaE7E4p0a9FYD9MjY4MTywJVs95/RAxzn6ra5up3RGfJf257cHtIIIxftD2nX
bC8=

( open-root ( 2:d0 ) ) ( open-dir ( 9:directory 2:d0 2:d1 ) ) ( change-dir-prop ( 2:d1 9:property2 ( 6:value2 ) ) ) ( close-dir ( 2:d1 ) ) ( open-file ( 5:file1 2:d0 2:c2 ) ) ( change-file-prop ( 2:c2 9:property1 ( 6:value1 ) ) ) ( close-file ( 2:c2 ( ) ) ) ( delete-entry ( 5:file2 2:d0 ) ) ( add-file ( 5:file3 2:d0 2:c3 ( ) ) ) ( close-file ( 2:c3 ( ) ) ) ( close-dir ( 2:d0 ) ) ( close-edit ( ) )

-- 
Arfrever Frehtes Taifersar Arahesis

Received on 2009-03-08 19:05:30 CET

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