Re: auto-props on import use local temp file name instead of remote destination file name
Hi Justin, On Fri, Jun 25, 2010 at 09:09:39AM -0500, Justin Johnson wrote: > I am attempting to import a file and set svn:eol-style in one command using > the --auto-props and --config-option options to svn import. When I do the > import I explicitly specify the file name in the import URL. The reason I > do this is because I want to import from a randomly generated temp file name > but I want the file to be named config.ini in the repository. After some > testing I have determined that svn uses the temp file name when evaluating > if an auto-prop should be applied instead of using the remote file name > specified on the import URL. The test script below reproduces the problem. > > It seems to me that when a path to a file is specified as the import URL, > svn should use that file name in evaluating the auto-props, but perhaps > there is some other reason it works this way. If anyone can clarify or > confirm that this is a bug I would appreciate it. Why don't you just rename the file to config.ini before import? Tino. -- "What we nourish flourishes." - "Was wir nähren erblüht." www.tisc.de
Re: Exception in blame.c, line 487 encountered
Patrick Kursawe wrote on Thu, 24 Jun 2010 at 16:03 -: [...] In file 'D:\Development\SVN\Releases\TortoiseSVN-1.6.8\ext\subversion\subversion\libsvn_client\blame.c' line 487: assertion failed (frb->last_filename == NULL) Am 6/25/2010 11:16 AM, schrieb Daniel Shahaf: It would probably help if you tell us how to reproduce the issue. That is, tell us what command to run on some public repository to get the assertion, or give us a script (starting with 'svnadmin create') that ends with invoking the assertion. I'm not sure if this was reported before. Thanks, Daniel After fighting for quite some time to get subversion compiled on windows using VC 08 Express Edition I finally managed to reproduce the issue in the debugger. It looks like annotate tries to fetch one more revision before the first revision specified. The mentioned assertion fails if it gets more than one - which is the case if you specify that you want merge info and the last operation before was merging in a few changes. I have created a test repository, you can get it from http://docs.google.com/leaf?id=0B2ZJ-TDG8hqkZGMyMTc4ZjMtYjk5OS00ZDAwLTliYmQtNjZiNDM1YTAxZmZj&sort=name&layout=list&num=50 Just checkout "trunk" and run svn annotate -g -r6:7 a.txt Bye! Patrick
Question about pysvn installer for Windows
I don't know if this question belongs here or not but in any case, any advice is appreciated Originally posted on tigris.org On Jun 28, 2010, at 10:30 AM, Steve Johnson wrote: > > I'm not sure this is the correct place to ask this question. Briefly, I am trying to install pysvn using the py26-pysvn-svn156-1.7.1-1233.exe Windows installer. I get an error about Python2.6 not being installe but it is installed (by Cygwin) and it's in my PATH so I wonder what your installer "thinks" it needs to detect Python. > > > > Where can I find help with this? The best place for this question would be the users@subversion.apache.org list. Subversion, like all Tigris projects, maintains its own mail lists, help resources, and knowledge base. The list you contacted, feedb...@tigris, is only involved in whole-site matters, like maintenance and down-time. -==- Jack Repenning jackrepenn...@tigris.org Domain Administrator http://www.tigris.org -- Steve Johnson, Senior Content Developer Caringo ste...@caringo.com
How to trigger internal svn diff algorithm when an external one is supplied?
I'm a meld (a visual diff program) user. I also enjoy colordiff when viewing diff's on the command line. I therefore have "diff-cmd = /usr/bin/colordiff" set in my ~/.subversion/config file. The color codes (naturally) confuse meld, and this would really be the case if my diff-cmd was set to meld itself or some-other diff program that didn't output in standard diff-format. Is there a way to override, on the command-line or some such, the config specified diff-cmd and set it back to the internal diff? If not should I open an issue? -- Philippe Chaintreuil
Re: Exception in blame.c, line 487 encountered
Patrick Kursawe wrote on Mon, 28 Jun 2010 at 12:18 -: > Patrick Kursawe wrote on Thu, 24 Jun 2010 at 16:03 -: > > > [...] > > In file > > 'D:\Development\SVN\Releases\TortoiseSVN-1.6.8\ext\subversion\subversion\libsvn_client\blame.c' > > line 487: assertion failed (frb->last_filename == NULL) > > > > > > Am 6/25/2010 11:16 AM, schrieb Daniel Shahaf: > > It would probably help if you tell us how to reproduce the issue. That > > is, tell us what command to run on some public repository to get the > > assertion, or give us a script (starting with 'svnadmin create') that ends > > with invoking the assertion. > > > > I'm not sure if this was reported before. > > > > Thanks, > > > > Daniel > > > After fighting for quite some time to get subversion compiled on > windows using VC 08 Express Edition I finally managed to reproduce the > issue in the debugger. Wow. NICE. You're the first person I know of to be able to build Subversion on Windows without fighting with it for days/weeks before... (and you even have a working debug environment) How did you do that? > I have created a test repository, you can get it from > http://docs.google.com/leaf?id=0B2ZJ-TDG8hqkZGMyMTc4ZjMtYjk5OS00ZDAwLTliYmQtNjZiNDM1YTAxZmZj&sort=name&layout=list&num=50 > > Just checkout "trunk" and run > svn annotate -g -r6:7 a.txt > I can reproduce the issue using your repository and trunk svn.exe: [[[ ..\..\..\subversion\libsvn_fs_fs\tree.c:971: (apr_err=235000) svn: In file '..\..\..\subversion\libsvn_client\blame.c' line 494: assertion failed (frb->last_filename == NULL) ]]] Firstly, could you please file an issue in our tracker, so we don't forget it? Secondly, could you share a script that produces your example repository? (it's easier for us to consume that way) > It looks like annotate tries to fetch one more revision before the > first revision specified. The mentioned assertion fails if it gets > more than one - which is the case if you specify that you want merge > info and the last operation before was merging in a few changes. To be honest, I haven't looked at it under a debugger. Could you please summarize your findings in the issue? If you'd like to write a patch for this, you're more than welcome to do so. Our patch guidelines are here: http://subversion.apache.org/docs/community-guide/general.html#patches > Thanks a lot! Daniel > Bye! > Patrick >
Re: How to trigger internal svn diff algorithm when an external one is supplied?
Philippe Chaintreuil wrote on Mon, 28 Jun 2010 at 22:42 -: > I'm a meld (a visual diff program) user. I also enjoy colordiff when > viewing diff's on the command line. I therefore have "diff-cmd = > /usr/bin/colordiff" set in my ~/.subversion/config file. The color > codes (naturally) confuse meld, and this would really be the case if my > diff-cmd was set to meld itself or some-other diff program that didn't > output in standard diff-format. > > Is there a way to override, on the command-line or some such, the > config specified diff-cmd and set it back to the internal diff? > In 1.7, yes: [[[ % svn1.7 help diff --diff-cmd ARG : use ARG as diff command --internal-diff : override diff-cmd specified in config file [alias: --idiff] ]]] In 1.6, you can try using 'svn diff --config-option', or just % svn diff --config-dir=/tmp/nonexistent-but-will-be-created-by-this-command > If not should I open an issue? > > -- Philippe Chaintreuil > >
Re: Question about pysvn installer for Windows
My advice: don't mix Cygwin and non-Cygwin. (Either get native-windows Python, or get a cygwin pysvn.) Steve Johnson wrote on Mon, 28 Jun 2010 at 21:49 -: > I don't know if this question belongs here or not but in any case, any advice > is appreciated Originally posted on tigris.org > > > On Jun 28, 2010, at 10:30 AM, Steve Johnson wrote: > > > > I'm not sure this is the correct place to ask this question. Briefly, I am > trying to install pysvn using the py26-pysvn-svn156-1.7.1-1233.exe Windows > installer. I get an error about Python2.6 not being installe but it is > installed (by Cygwin) and it's in my PATH so I wonder what your installer > "thinks" it needs to detect Python. > > > > > > Where can I find help with this? > The best place for this question would be the users@subversion.apache.org > list. > > Subversion, like all Tigris projects, maintains its own mail lists, help > resources, and knowledge base. The list you contacted, feedb...@tigris, is > only involved in whole-site matters, like maintenance and down-time. > > > -==- > Jack Repenning > jackrepenn...@tigris.org > Domain Administrator > http://www.tigris.org > > > > > >
