Re: AW: New to subversion, need to find documentation on writing hooks
On 2012-05-22 08:21, Markus Schaber wrote: [...] > At my current employer, we successfully use Jenkins. > > But there are other such systems, for example the java-based > http://cruisecontrol.sourceforge.net/ and its .NET cousing > http://www.cruisecontrolnet.org/ - both of them were used at one of my former > employers place. At another former employers place, we used post-commit hooks > triggering a self-written python daemon which ran appropriate scons build > files. And AFAIR, Microsoft also provides some auto-build solution for VSS or > TFS. > > http://en.wikipedia.org/wiki/Continuous_integration#Software contains a list > of CI software. > > So even if you don't like Hudson or Jenkins for whatever reason, there are > lots of alternatives, and I strongly suggest you evaluate continuous > integration in your environment. [...] Ted, Please have a look at the (commmercial) CI tool TeamCity. It is able to do so-called "pre-checked commits", which might help with your objective, i.e. keeping bad commits out of the codeline. http://en.wikipedia.org/wiki/TeamCity http://www.jetbrains.com/teamcity/features/index.html -- Michael Diers, elego Software Solutions GmbH, http://www.elegosoft.com/
Re: Can't execute svn commands through the network
On 21.05.2012 12:58, Philip Martin wrote: Michael Fausten writes: since we updated our SVN-Server to version 1.7.0 we're no longer able to execute commands through samba mounted shares. Commands through our LAN is still working. For example: # /usr/home/michael/mnt/websites.sh Content from website.sh: mount_smbfs -N -I 192.168.23.225 -E utf-8:cp1252 //fausten@KALI-FILES/pw-websites /usr/home/michael/mount/pw-websites utf8:cp1252 option is needed, otherwise the German umlauts are broken on the share. % cd /usr/home/michael/mount/pw-websites/path/to/my/website % svn status -u svn: E200030: sqlite: disk I/O error svn: E200030: sqlite: disk I/O error On my PC (locally) svn just works fine. I use a FreeBSD 9.0 amd64 machine with, since today subversion 1.7.5, but the error still occurs. Builded subversion with (Compiler Options): P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE NEON - No private modifications Our server uses FreeBSD 8.2 with Subversion 1.7.5. Let me see if I understand: - you have a working copy on a Samba network disk - the Samba server is FreeBSD 8.2 - the Samba client is FreeBSD 9.0 This is correct. On Linux I'd run "strace svn st -u" to find out which system call is failing. Do you have strace installed? Perhaps truss can provide the information? No I don't. strace is only for i386 while I'm running amd64. DTrace isn't also an option for me, because I would need to rebuild my kernel. But I'm just a beginner, so I don't think this would end well :) I tried truss, but I can't do anything with the results. Maybe they are interesting for you? http://www.file-upload.net/download-4381573/truss.log.html It appears that your Samba setup doesn't support some POSIX sematics. Perhaps mounting nobrl will help? Unfortunately mount_smbfs doesn't support the nobrl option.
Re: Reintegrate merging with sparse checkouts
On Mon, May 21, 2012 at 9:00 PM, Brian Neal wrote: [ ... ] > I was able to reproduce the issue, please see the attached > sparse-merge.txt and I captured the output and error that I see in the > attached file out.txt. (Note that I had to rename sparse-merge.bat to > sparse-merge.txt before Gmail would send it). > > I am using SVN 1.7.4 on Windows XP. > > The high level description of what is going on in the script is: > > 1. Create a repo using your sample greek tree. > 2. Make a sparse working copy of trunk, omitting the A\B directory (trunk_wc) > 3. Copy trunk to a feature branch. > 4. Make a sparse working copy of the feature branch (omitting A\B -- > branch_wc) > 5. Make a full working copy of trunk (trunk_b_wc). > 6. Now change files in all three working copies and commit (but don't > create conflicts). In particular, in trunk_b_wc, change a file under > A\B. > 7. Merge trunk to the feature branch. > 8. Reintegrate merge the feature branch back to trunk. > 9. Observe that the merge fails, presumably because the changes to A\B > never made it to the feature branch. Ah ok, I see. It fails with: svn: E195016: Reintegrate can only be used if revisions 2 through 6 were previously merged from file:///C:/Temp/svn-test /repos/trunk to the reintegrate source, but this is not the case: branches/feature/A Missing ranges: /trunk/A:4 where revision 4 is the revision on trunk which affected A\B, which was missing (excluded by sparseness) from the branch-wc which you used to do the sync merge. I believe that this is normal behavior then, with the current functionality of svn: revision 4 is indeed not synced, and the branch must be synced completely (there must not be any gaps) for it to be reintegratable. OTOH, you could argue that --reintegrate should just work in this case, similar to the normal sync merge, by only looking at the parts that are present in the working copy (and using non-inheritable mergeinfo to mark the parts where the (reintegrate) merge was not performed in full). Hmmm, otherwise you'd almost always need full working copies to perform the merges, even if you're fine with only merging (and reintegrating) some parts ... I'm not really an expert on the merge logic and tracking, but I think this would be a useful enhancement (unless someone contradicts me here). So I'd say: please file an issue. -- Johan
Re: Can't execute svn commands through the network
On Tue, May 22, 2012 at 7:28 AM, Michael Fausten wrote: > >> - the Samba server is FreeBSD 8.2 >> >> - the Samba client is FreeBSD 9.0 > > > This is correct. It seems odd in general to use samba between unix-type machines instead of nfs - or just using ssh, remote X, or freenx to log into the machine that has the disk space. Can you use nfs instead (you can still share the same space with samba if there are also windows clients) ? >> It appears that your Samba setup doesn't support some POSIX sematics. >> Perhaps mounting nobrl will help? > > Unfortunately mount_smbfs doesn't support the nobrl option. Linux has a cifs mount option that preserves more of the unix semantics than smb, but I don't know if that exists in freebsd. -- Les Mikesell lesmikes...@gmail.com
Re: Can't execute svn commands through the network
Michael Fausten writes:
>> Let me see if I understand:
>>
>> - you have a working copy on a Samba network disk
>>
>> - the Samba server is FreeBSD 8.2
>>
>> - the Samba client is FreeBSD 9.0
>
> This is correct.
>
>> On Linux I'd run "strace svn st -u" to find out which system call is
>> failing. Do you have strace installed? Perhaps truss can provide the
>> information?
>
> No I don't. strace is only for i386 while I'm running amd64. DTrace
> isn't also an option for me, because I would need to rebuild my kernel.
> But I'm just a beginner, so I don't think this would end well :)
> I tried truss, but I can't do anything with the results. Maybe
> they are interesting for you?
>
> http://www.file-upload.net/download-4381573/truss.log.html
It's something to do with locking:
open("/usr/home/michael/mount/pw-websites/PW-Websites/baumarkt.de/Website-online
/.svn/wc.db",O_RDWR|0x10,00) = 3 (0x3)
[...]
fcntl(3,F_SETLK,0x7fffbaf0) = 0 (0x0)
fcntl(3,F_SETLK,0x7fffc2a0) = 0 (0x0)
fcntl(3,F_SETLK,0x7fffc2a0) ERR#11 'Resource deadlock avoid
ed'
fcntl(3,F_SETLK,0x7fffc2a0) = 0 (0x0)
write(2,"svn: E200030: sqlite: disk I/O e"...,37) = 37 (0x25)
write(2,"svn: E200030: sqlite: disk I/O e"...,37) = 37 (0x25)
>> It appears that your Samba setup doesn't support some POSIX sematics.
>> Perhaps mounting nobrl will help?
>
> Unfortunately mount_smbfs doesn't support the nobrl option.
I suspect that sqlite is attempting byte range locking and your server
doesn't support it. I don't know what to do about that.
--
Philip
Constraint Failed on update to externals
Hi, I found a reference to someone having this problem in 2011, but there doesn't appear to have been any response or fix. Sorry if this is a repost or is already being investigated. I have a path within a Subversion 1.4.4 server (with a 1.7.7 client) which has an external: http://svn.mycompany.co.uk/ |--> /my-repo/src |--> build-resources [ points to http://svn.mycompany.co.uk/my-repo/build-resources ] I'm moving the external to a different location: https://othersvn.mycompany.co.uk/new-repo/build-resources However, after I commit this, anyone who updates the directory gets the following error: External failed: my-repo\src\external Error: sqlite: constraint failed Error: sqlite: EXTERNALS.def_repos_relpath may not be NULL The external is updated correctly and the local copy seems to be OK, so this error is not a blocker. However, I'd prefer not to get the error in the first place, particularly as I update externals fairly often. This doesn't happen if the external is on the same repository as the parent. Steps to reproduce: 1. Create a directory in subversion (mkdir blah; svn add blah; svn commit blah) 2. Add and commit an external pointing at some other directory in the same repository (svn ps svn:externals ...; svn ci) 3. Edit and commit the external to point at any folder in a different repository (svn ps svn:externals ...) 4. Update the directory (svn up) You'll get the error on the last step. Steve.
Subversion Exception!
Please I need your help, when try to Upgrade Working copy to commit to SVN Server its throw the next exception: --- Subversion Exception! --- Subversion encountered a serious problem. Please take the time to report this on the Subversion mailing list with as much information as possible about what you were trying to do. But please first search the mailing list archives for the error message to avoid reporting the same problem repeatedly. You can find the mailing list archives at http://subversion.apache.org/mailing-lists.html Subversion reported the following (you can copy the content of this dialog to the clipboard using Ctrl-C): In file 'D:\Development\SVN\Releases\TortoiseSVN-1.7.7\ext\subversion\subversion\libsvn_wc\entries.c' line 1666: assertion failed (parent_node || entry->schedule == svn_wc_schedule_normal)
