FeatureRequest: Improved svn:externals handling on Merge
Hi Developers, I'm redirected here from the tortoise mailing list, as they think this feature belongs to the area of the svn library. Performing some searches shows that I'm not the only one with this problem, even it it seems to be never posted here. The basic problem I have is I have a Project with svn:externals defined pointing into the same SVN. When I now make a tortoiseSVN commit the files changed inside the svn:externals folders are included - so all works great. If I now try to merge these commit into a other checkout the changes inside the svn:externals are not merged, they are silently ignored. I need to do a separate merge at the svn:externals folders. Doing so works fine, but why having to do this manually? As externals are silently included into commits it is easily overseen that a commit includes externals at merging. So if these externals are not merged or at least warned while merging they will be overseen -> an great source for new bugs... The merge of svn:externals is not done automatically independent of if the folder at the merge target is an linked svn:externals folder or a real folder. Now a detailed example for better visualisation: I have the following svn structure: svn://svn/test/main/trunc svn:external Propery: svn://svn/test/sub/trunc sub File: Mainfile.txt svn://svn/test/sub/trunc Project File: Subfile.txt Now I make a branch and set the svn:external Propery: svn://svn/test/main/branch1 svn:external Propery: svn://svn/test/sub/branch1 sub File: Mainfile.txt svn://svn/test/sub/branch1 Project File: Subfile.txt On a Checkout of main Project this will result in the following file structures: mainTrunc | Mainfile.txt | sub | | Subfile.txt mainBranch | Mainfile.txt | sub | | Subfile.txt If I make changes at Mainfile.txt and Subfile.txt at main in one commit with version 123. To merge these changes to the branch I have to do the following: 1. Go to mainBranch folder an merge svn://svn/test/main/trunc version 123 2. Go to mainBranch/sub folder and merge svn://svn/test/sub/trunc version 123 All information required for the 2. merge of the externals folder is already known by the tortoise client. It knows there are files at the svn://svn/test/sub/trunc folder included at these commit and it knows these files are loyally stored at mainBranch/sub folder. With best regards, Marcel Hesselbarth
svnsync: E160013
Dear all, My users often get errors like this one when performing svn operations like commit or update. Error: post-commit hook failed (exit code 1) with output: Error: svnsync: E160013: '/svn/VTRSTCIT/!svn/txr/4174-387/BusinessObjects/Reports/ENDUR/ENDUR_Controlling/ICE_CO2_%20Bewertung_nach_Portfolio_und_Lieferjahr_+2012.rep' path not found We use VisualSVN 2.5.5 which includes Subversion 1.7.5 on Windows 2008 R2 running behind an IIS 7.5 as reverse-proxy, the mirror server uses the same versions of the software. Clients use TortoiseSVN 1.7.7. It seems that the commit was successful on the main subversion server but svnsync isn't able to sync because the version of the mirror repository is behind the master repository. Any ideas how to solve this? Regards, Daniel
Re: svnsync: E160013
Guten Tag Wagner Daniel, am Montag, 30. Juli 2012 um 14:34 schrieben Sie: > Error: post-commit hook failed (exit code 1) with output: > Error: svnsync: E160013: > '/svn/VTRSTCIT/!svn/txr/4174-387/BusinessObjects/Reports/ENDUR/ENDUR_Controlling/ICE_CO2_%20Bewertung_nach_Portfolio_und_Lieferjahr_+2012.rep' > path not found [...] > Any ideas how to solve this? Please provide some more details about how exactly your sync process is implemented because post-commit-hooks are not executed on updates, therefore your users can't get the above errors, and your mirror of course is always behind the master, else there wouldn't be anything to sync. We really need to know how exactly your hook looks like to know how svnsync is invoked and you maybe should even provide which svnsync init command was executed. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon.030-2 1001-310 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hanover HRB 207 694 - Geschäftsführer: Andreas Muchow
SVN + Shadow Copy
Hello all, I am a rather experienced developer and I’m currently trying to use SVN to back up a batch of files automatically every X hours. The problem is that some of the files are open and the commit fails entirely. I have managed to invoke a non-persistent Shadow Copy over the volume but since I am not using a windows server but windows 7 the shadow copy is read-only. (I am using the vscsc.exe variant of the Shadow Copy SDK from Microsoft). Everything would work just fine if this Shadow Copy was write-enabled because the .svn folder files cannot be edited and because so the script (running "svn add" or "svn commit") cannot complete. Has anyone tried this scenario before? If so is there any way to invoke a simple "svn commit" over open files (using shadow copy or not) on an non-server based operating system? Thank you for any thoughts, Fernando M. A. Gomes
Re: SVN + Shadow Copy
Guten Tag Fernando Gomes, am Montag, 30. Juli 2012 um 21:52 schrieben Sie: > Has anyone tried this scenario before? If so is there any way to > invoke a simple "svn commit" over open files (using shadow copy or > not) on an non-server based operating system? If you are able to create and expose a shadow copy, why not copy the files to some different, writable volume and use svn from there? diskshadow is able to automate such a process and while it is not included in Windows 7, copied from a server it should run just fine. I used it some time ago to restore shadow copies, I think. In general, because of timestamps, ACLs, ADS etc. of NTFS files, I wouldn't recommend using SVN as a general backup tool. Windows backup is a goot tool and can be automated using wbadmin, too. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon.030-2 1001-310 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hanover HRB 207 694 - Geschäftsführer: Andreas Muchow
Re: SVN + Shadow Copy
Am 30.07.2012 21:52, schrieb Fernando Gomes: I’m currently trying to use SVN to back up a batch of files automatically every X hours. The problem is that some of the files are open and the commit fails entirely. Question here: What if someone adds or deletes a file? If this is also of concern to you, I'd definitely take a look at svn_load_dirs, which should hopefully work on a read-only medium, too. It doesn't even require a working copy to sync the state in the repository with the state on disk. However, even if tree changes are not an issue, it could be worth a look. Good luck! Uli ** Domino Laser GmbH, Fangdieckstra�e 75a, 22547 Hamburg, Deutschland Gesch�ftsf�hrer: Thorsten F�cking, Amtsgericht Hamburg HR B62 932 ** Visit our website at http://www.dominolaser.com ** Diese E-Mail einschlie�lich s�mtlicher Anh�nge ist nur f�r den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empf�nger sein sollten. Die E-Mail ist in diesem Fall zu l�schen und darf weder gelesen, weitergeleitet, ver�ffentlicht oder anderweitig benutzt werden. E-Mails k�nnen durch Dritte gelesen werden und Viren sowie nichtautorisierte �nderungen enthalten. Domino Laser GmbH ist f�r diese Folgen nicht verantwortlich. **
