Re: bug in mixed-version detection + single-file externals

2011-02-22 Thread Daniel Shahaf
Recent trunk on Debian. Jason Sachs wrote on Tue, Feb 22, 2011 at 16:04:24 -0500: > Shall we trade version info? > > I'm running on WinXP SP3, with svn command line from Wandisco > binaries, svn version 1.6.15 (r1038135) compiled Nov 25 2010, 16:55:30 > > On Tue, Feb 22, 2011 at 2:09 PM, Daniel

Re: bug in mixed-version detection + single-file externals

2011-02-22 Thread Jason Sachs
Shall we trade version info? I'm running on WinXP SP3, with svn command line from Wandisco binaries, svn version 1.6.15 (r1038135) compiled Nov 25 2010, 16:55:30 On Tue, Feb 22, 2011 at 2:09 PM, Daniel Shahaf wrote: > Having fixed that (the fix was to use "--" in argv), I get this output > with

Re: bug in mixed-version detection + single-file externals

2011-02-22 Thread Daniel Shahaf
Jason Sachs wrote on Tue, Feb 22, 2011 at 12:02:55 -0500: > > svn: Unrecognized format for the relative external URL 'blah.txt'. > > 4 > > ]]] > > > > I'm not sure what causes this, but for reference here's the output of > > 'svn help propset' from trunk: > > I had to use "blah.txt -r 3 ^/foo/tru

Re: bug in mixed-version detection + single-file externals

2011-02-22 Thread Jason Sachs
On Tue, Feb 22, 2011 at 11:50 AM, Daniel Shahaf wrote: > Could you use "#!/usr/bin/env python" as the first line please? > > Also, the script should rm -rf repos working w_foo w_bar, to make it > re-runnable. > I can't seem to automatically delete the directoriesk (either by "rm -rf" or python's

Re: bug in mixed-version detection + single-file externals

2011-02-22 Thread Jason Sachs
> svn: Unrecognized format for the relative external URL 'blah.txt'. > 4 > ]]] > > I'm not sure what causes this, but for reference here's the output of > 'svn help propset' from trunk: I had to use "blah.txt -r 3 ^/foo/trunk/blah.txt" rather than "-r 3 ^/foo/trunk/blah.txt blah.txt" as it would

Re: bug in mixed-version detection + single-file externals

2011-02-22 Thread Daniel Shahaf
Jason Sachs wrote on Tue, Feb 22, 2011 at 11:36:45 -0500: > Hmm, a merge attempt isn't that hard, here's another script that does > that, and has the same problem. > > We don't use local file repositories, but this has the same symptom as > w/ a remote server. > > hope it's either an easy fix or

Re: bug in mixed-version detection + single-file externals

2011-02-22 Thread Daniel Shahaf
Jason Sachs wrote on Tue, Feb 22, 2011 at 11:07:38 -0500: > >> If you could write a script that starts with an empty repository, gets a > >> working copy, and runs svn commands until the problem triggers, that would > >> help greatly (and avoids any ambiguity in the problem description!). > > > > S

Re: bug in mixed-version detection + single-file externals

2011-02-22 Thread Jason Sachs
> hope it's either an easy fix or an easy workaround... ...or that it's something wrong with my setup and not a bug after all.

Re: bug in mixed-version detection + single-file externals

2011-02-22 Thread Jason Sachs
Hmm, a merge attempt isn't that hard, here's another script that does that, and has the same problem. We don't use local file repositories, but this has the same symptom as w/ a remote server. hope it's either an easy fix or an easy workaround... --Jason import subprocess import os def getDirAs

Re: bug in mixed-version detection + single-file externals

2011-02-22 Thread Stefan Sperling
On Tue, Feb 22, 2011 at 11:07:38AM -0500, Jason Sachs wrote: > >> If you could write a script that starts with an empty repository, gets a > >> working copy, and runs svn commands until the problem triggers, that would > >> help greatly (and avoids any ambiguity in the problem description!). > > >

Re: bug in mixed-version detection + single-file externals

2011-02-22 Thread Jason Sachs
>> If you could write a script that starts with an empty repository, gets a >> working copy, and runs svn commands until the problem triggers, that would >> help greatly (and avoids any ambiguity in the problem description!). > > See attached python script (tested only on WinXP + Python 2.6.5) > S

Re: bug in mixed-version detection + single-file externals

2011-02-22 Thread Jason Sachs
> The problem with reintegrate merges you are describing sounds > quite serious and should be added to the issue tracker. I had recently submitted it (but didn't know about posting to this list first). See http://subversion.tigris.org/issues/show_bug.cgi?id=3816 > Can you share more information t

Re: bug in mixed-version detection + single-file externals

2011-02-22 Thread Stefan Sperling
On Tue, Feb 22, 2011 at 09:52:05AM -0500, Jason Sachs wrote: > I'm having trouble with single-file externals, and I suspect this is a > bug in svn rather than in my setup. > > The file externals work fine except for one thing: they cause svn to > see my checkout incorrectly as a mixed-revision che