Re: merging external repo with file properties corrupts working copy

Markus Springweiler wrote on Tue, 11 Nov 2008 at 14:48 +0100:
> What's wrong with this? I consider this a serious bug -- should I just hack
> it into the bugtracker although the website says I should discuss this first
> *here*?

+1. (FWIW, I can reproduce it with my possibly-somewhat-old trunk build.)
I hoped to find some time to look into it, but haven't yet :(

Thanks,

Daniel

(BTW, I'm attaching a slightly more reusable (wrapped and with config
variable) version of your repro script.)

> > Hello,
> >
> > I tried the following with 1.5.3 and 1.5.4, starting with SharpSv,
> > verified with TortoiseSvn and finally wrote the script below (against
> > SlikSvn:tag/1.5.4_at_33870 Win32) which is meant to be executed in
> > "D:\Temp\dummy" -- or the 6 occurences of "file:///d:/temp/dummy" have to
> > be changed accordingly:
> >
> > rem create base-repo
> > mkdir repo1
> > svnadmin create repo1
> > svn co file:///D:/Temp/dummy/repo1 co_repo1_root
> > svn mkdir co_repo1_root\libs
> > svn mkdir co_repo1_root\libs\TestLib
> > svn mkdir co_repo1_root\libs\TestLib\trunk
> > dir > co_repo1_root\libs\TestLib\trunk\somedata.txt
> > svn add co_repo1_root\libs\TestLib\trunk\somedata.txt
> > svn propset customprop prop-on-dir co_repo1_root\libs\TestLib\trunk
> > svn propset customprop prop-on-file
> > co_repo1_root\libs\TestLib\trunk\somedata.txt
> > svn commit co_repo1_root -m r1-Data
> >
> > rem prepare second repo
> > mkdir repo2
> > svnadmin create repo2
> > svn mkdir file:///D:/Temp/dummy/repo2/replay -m "place for replay"
> > svn co file:///D:/Temp/dummy/repo2/replay replay
> > rem merge base-repo r1 into "replay"
> > svn merge file:///d:/Temp/dummy/repo1_at_0
> > file:///d:/Temp/dummy/repo1/libs/TestLib/trunk_at_1 replay
> >
> > rem both directory and file properties are "present":
> > svn proplist replay -Rv
> > rem just the same as with svn proplist co_repo1_root -Rv
> >
> > rem but the file property is missing in the diff (and does not get
> > commited):
> > svn diff replay
> > rem Tortoise shows a warning in the commit-dialog: "There are changes or
> > unversioned items inside
> > rem one or more directories which you have included with svn:externals.
> > rem Those files are not listed for commit. You need to commit those files
> > separately."
> >
> > rem commiting via command-line works (no warnings like in Tortoise)
> > svn commit replay -m "commit with missing file props"
> > svn status replay
> > rem nothing to change, but:
> > svn co file:///D:/Temp/dummy/repo2/replay replay2
> > svn proplist replay2 -Rv
> > rem file props got not commited, but still are present in the other
> > working dir
> > svn proplist replay -Rv
> >
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org