RE: merge does not allow --accept argument

2009-12-18 Thread Bob Archer
> > -Original Message- > > > I am using Subversion 1.6.5 r38866 on Ubuntu 9.10 (my $SHELL is > > > /bin/bash). Trying to use merge and have it automatically > accept > > > my changes during conflicts by issuing: > > > svn merge --accept mine-full -c 12345 > > https://repository/branches/

RE: merge does not allow --accept argument

2009-12-18 Thread Siefert, David
> -Original Message- > From: Bob Archer [mailto:bob.arc...@amsi.com] > Sent: Friday, December 18, 2009 2:53 PM > To: Siefert, David; users@subversion.apache.org > Subject: RE: merge does not allow --accept argument > > > I am using Subversion 1.6.5 r38866 on Ubuntu 9.10 (my $SHELL is > > /

RE: merge does not allow --accept argument

2009-12-18 Thread Bob Archer
> I am using Subversion 1.6.5 r38866 on Ubuntu 9.10 (my $SHELL is > /bin/bash). Trying to use merge and have it automatically accept > my changes during conflicts by issuing: > svn merge --accept mine-full -c 12345 > https://repository/branches/blah/blah/blah The above looks right. > also

merge does not allow --accept argument

2009-12-18 Thread Siefert, David
Hi All, I am using Subversion 1.6.5 r38866 on Ubuntu 9.10 (my $SHELL is /bin/bash). Trying to use merge and have it automatically accept my changes during conflicts by issuing: svn merge --accept mine-full -c 12345 https://repository/branches/blah/blah/blah also tried the following var

Mirror sync problem

2009-12-18 Thread Bastien Semene
Hi, I've started to sync a mirror and received this error in return : # svnsync sync http://repos.com --username user --password pass Transmitting file data .svnsync: Server sent unexpected return value (500 Internal Server Error) in response to MKCOL request for '/!svn/wrk/b78fe308-e3eb-de11-

SVN API in Perl

2009-12-18 Thread Christian Kuelker
Dear Giulio Troccoli, > I'm simply trying to get the status of a WC. In my Perl script I have [...] > How do I use $status in status_receiver? The document http://www.perlmonks.org/?node_id=738308 might help. Attached script shows simple usage. It assumes a checked out repro at /tmp/svn. Kind r

Re: Subversion 1.6.6 doesn't appear to allow adding files with @ in the name

2009-12-18 Thread John Beranek
2009/12/18 John Beranek : > 2009/12/18 Alec Kloss : >> Subject pretty much says it all.  My 1.6.4 client does allow adding >> files with an @ in their name. > > $ svn add "a...@a@" > A         a...@a Chatper 3, page 90 of the Subversion book. John.

Re: Subversion 1.6.6 doesn't appear to allow adding files with @ in the name

2009-12-18 Thread Alec Kloss
On 2009-12-18 15:01, John Beranek wrote: > 2009/12/18 Alec Kloss : > > Subject pretty much says it all.  My 1.6.4 client does allow adding > > files with an @ in their name. > > $ svn add "a...@a@" > A a...@a > > ;) > > John. > Thanks everyone, I should have thought of that. -- ale

Re: permissions bug

2009-12-18 Thread Giovanni Venturi
In data venerdì 18 dicembre 2009 15:46:43, hai scritto: > On Dec 18, 2009, at 05:37, Giovanni Venturi wrote: > > I read here: > > > > http://svnbook.red-bean.com/en/1.0/ch06s04.html > > I don't know the answer to your specific question, but that URL is for the > Subversion 1.0 book, which is very

Re: Subversion 1.6.6 doesn't appear to allow adding files with @ in the name

2009-12-18 Thread John Beranek
2009/12/18 Alec Kloss : > Subject pretty much says it all.  My 1.6.4 client does allow adding > files with an @ in their name. $ svn add "a...@a@" A a...@a ;) John.

Re: Subversion 1.6.6 doesn't appear to allow adding files with @ in the name

2009-12-18 Thread Felix Gilcher
The @ sign denotes a peg revision. Just add another @ at the end of the filename, that should do the trick. Felix Sent from my iPhone On 18.12.2009, at 15:50, "Alec Kloss" wrote: Subject pretty much says it all. My 1.6.4 client does allow adding files with an @ in their name. mybox% svna

Subversion 1.6.6 doesn't appear to allow adding files with @ in the name

2009-12-18 Thread Alec Kloss
Subject pretty much says it all. My 1.6.4 client does allow adding files with an @ in their name. mybox% svnadmin create repo mybox% svn co repo work svn: 'repo' does not appear to be a URL mybox% svn co file:///$PWD/repo work Checked out revision 0. mybox% touch work/t...@file mybox% svn add wo

Re: permissions bug

2009-12-18 Thread Ryan Schmidt
On Dec 18, 2009, at 05:37, Giovanni Venturi wrote: > I read here: > > http://svnbook.red-bean.com/en/1.0/ch06s04.html I don't know the answer to your specific question, but that URL is for the Subversion 1.0 book, which is very old. You should consult the Subversion 1.5 book (the newest avail

Re: viewvc svn revealing fullpaths

2009-12-18 Thread Mark Phippard
You should post to us...@viewvc.tigris.org On Thu, Dec 17, 2009 at 10:00 PM, Adam Richards wrote: > Hi, > > I don't want users to view the entire directory path when > navigating to a repository -- but it seems this is the default > behavior.  I've dug around in the config file, and in the users@

svn: Error resolving case of:

2009-12-18 Thread Robin
Good Morning! I am having an issue with the Windows cli SVN client. I was doing a dry run of a merge from a development branch to the trunk using: svn merge --dry-run -r9440:9647 branches/branch1/ trunk/ when I got an error regarding a failure to access a temp file. From Windows I got a warnin

permissions bug

2009-12-18 Thread Giovanni Venturi
Hello, I read here: http://svnbook.red-bean.com/en/1.0/ch06s04.html It's also possible to explicitly deny permission to someone via inheritance rules, by setting the username variable to nothing: [calc:/branches/calc/bug-142] harry = rw sally = r [calc:/branches/calc/bug-142/secret] harry = I

viewvc svn revealing fullpaths

2009-12-18 Thread Adam Richards
Hi, I don't want users to view the entire directory path when navigating to a repository -- but it seems this is the default behavior. I've dug around in the config file, and in the users@ mailing-list, and haven't been able to find what I need. Before I go digging more through code I thought I'