Re: Reintegrate merging with sparse checkouts

2012-05-23 Thread Brian Neal
On Tue, May 22, 2012 at 7:31 AM, Johan Corveleyn wrote: > 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 fi

Re: Reintegrate merging with sparse checkouts

2012-05-21 Thread Brian Neal
On Mon, May 21, 2012 at 9:01 AM, Johan Corveleyn wrote: > [ Redirecting back to the list -- please always use "reply all" to > keep the discussion on the list. More below ... ] Sorry about that... see below. > > On Mon, May 21, 2012 at 3:54 PM, Brian Neal wrote: >>

Reintegrate merging with sparse checkouts

2012-05-18 Thread Brian Neal
Hello - My question is basically the same as this one: http://svn.haxx.se/users/archive-2010-04/0097.shtml We are forced to use an unwieldy and inconvenient directory structure. Spare checkouts are a big help to us. But it seems that (in the few times I have tried) to reintegrate a feature branc

Re: Corrupt working copy after merge cancel - SVN 1.7.4

2012-04-06 Thread Brian Neal
I'll keep the working copy around in case anyone wants us to troubleshoot it somehow. I don't know if you can interrogate the sqlite database or metadata somehow and see why it is "stuck". Again, we can't seem to reproduce the problem. Thanks, BN

Re: Corrupt working copy after merge cancel - SVN 1.7.4

2012-04-06 Thread Brian Neal
I just did some more testing. I tried to recreate my colleagues problem by creating a working copy, doing a merge, then cancelling it. I was unable to reproduce the problem in any event. I used both my values for TEMP and I also used his (C:\Windows\Temp). Thanks, BN 2012/4/6 Brian Neal

Re: Corrupt working copy after merge cancel - SVN 1.7.4

2012-04-06 Thread Brian Neal
Hello Thorsten, > C:\Windows\Temp is no default temporary directory for a user. Normally > Subversion would use the user specific Temp directory, unless you > configured your user to use Windows\Temp, which is not recommended at > all. I would guess that your environment may be a little bit specia

Corrupt working copy after merge cancel - SVN 1.7.4

2012-04-05 Thread Brian Neal
Hello - We are using SVN 1.7.4 and TortoiseSVN 1.7.6 on Windows. My colleague was doing a merge and hit cancel. His working copy now appears to be corrupted. All operations fail with a message that cleanup is needed. Trying to run cleanup at the top level folder results in Tortoise putting up an

Re: getversion.py invalid syntax

2012-03-22 Thread Brian Neal
The syntax except IOError, e: is perfectly valid in Python 2.7. Are you sure you are getting that particular error under 2.7? You'd have to change it to this for Python 3.x: except IOError as e: But that would not be backwards compatible with 2.x. Using a tool like 2to3.py may help produce a v

Re: Problem with Python bindings to SVN 1.7.4 on Windows

2012-03-21 Thread Brian Neal
On Wed, Mar 21, 2012 at 1:41 PM, Alagazam.net Subversion wrote: > > Do you have another libeay32.dll and ssleay32.dll in some other folder that > is before Subversion\bin in your path ? > If that's the case and these are older versions there might be trouble. > > /David a.k.a. Alagazam > Why yes,

Re: Problem with Python bindings to SVN 1.7.4 on Windows

2012-03-21 Thread Brian Neal
On Wed, Mar 21, 2012 at 12:10 PM, Cooke, Mark wrote: >> >> On Wed, Mar 21, 2012 at 11:12 AM, Brian Neal wrote: >> >> I have solved my problem by copying libeay32.dll and ssleay32.dll from >> the Subversion\bin folder to C:\Python27\Lib\site-packages\libsvn >>

Re: Problem with Python bindings to SVN 1.7.4 on Windows

2012-03-21 Thread Brian Neal
On Wed, Mar 21, 2012 at 11:12 AM, Brian Neal wrote: [... snip ..] > Hello - > > I'm trying to upgrade a Subversion and Trac install running on Windows > Server 2003 sp2. > > I've installed Subversion 1.7.4 from the .msi file found here: > http://sourceforge.ne

Problem with Python bindings to SVN 1.7.4 on Windows

2012-03-21 Thread Brian Neal
Hello - I'm trying to upgrade a Subversion and Trac install running on Windows Server 2003 sp2. I've installed Subversion 1.7.4 from the .msi file found here: http://sourceforge.net/projects/win32svn/files/1.7.4/ I'm also using the Python 2.7 bindings found in that same directory (svn-win32-1.7.

Re: Merging Properties?

2011-06-10 Thread Brian Neal
On Fri, Jun 10, 2011 at 4:28 AM, Stefan Sperling wrote: > On Fri, Jun 10, 2011 at 11:25:23AM +0200, Stefan Sperling wrote: >> On Fri, Jun 10, 2011 at 11:16:44AM +0200, Johan Corveleyn wrote: >> > On Fri, Jun 10, 2011 at 11:07 AM, Stefan Sperling wrote: >> > >> > ... >> > > svn ps color green $bra

Merging Properties?

2011-06-09 Thread Brian Neal
Hello, Suppose I have a file on trunk called file.txt. I put a property on it, say color with the value red. Now I copy trunk to a branch B. On branch B I change file.txt's color property to green. Now independently on trunk, I also change file.txt's color property to green. When I merge the branc