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 a...@avertech.net 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@
 mailing-list, and haven't been able to find what I need.  Before
 I go digging more through code I thought I'd post.

 The URL I want users to see when they navigate to a module within
 a repository, say, for example modules Module_1, Module_2,
 and Module_3, should be something like this:

  http://myserver.example.com/viewvc-cgi/viewvc.cgi/Module_1
  http://myserver.example.com/viewvc-cgi/viewvc.cgi/Module_2
  http://myserver.example.com/viewvc-cgi/viewvc.cgi/Module_3
  [...etc...]

 However, the behavior right now is this:

  http://myserver.example.com/viewvc-cgi/viewvc.cgi/repository/usr/home/svn/repository/Module_1
  http://myserver.example.com/viewvc-cgi/viewvc.cgi/repository/usr/home/svn/repository/Module_2
  http://myserver.example.com/viewvc-cgi/viewvc.cgi/repository/usr/home/svn/repository/Module_3

 Why is it, once I get to /viewvc-cgi/viewvc.cgi/repository/, I
 must then navigate through the real directory structure to reach
 the true module? Any advice on how to change this?  What
 configuration items am I missing?

 -
 My setup:

  viewvc 1.1.2
  svn: 1.6.6_1
  py: 2.6.2_3
  os: freebsd 7.2-rel

 repository stored here:

  /usr/home/svn/repository

 repository was created with this command:

  $ svnadmin create /usr/home/svn/repository

 apache configuration:

   ScriptAlias /viewvc-cgi/ /usr/local/viewvc/bin/cgi/
   Directory /usr/local/viewvc/bin/cgi
      AllowOverride None
      Options None
      Order allow,deny
      Allow from all
   /Directory

 ssh svn access with pubkeys; relevant pubkeys prefixed with this
 in ~/.ssh/authorized_keys2:

  command=/usr/local/bin/svnserve -t -r /usr/home/svn/repository 
 --tunnel-user=avr,no-port-forwarding,no-agent-forwarding,no-X11-forwarding,no-pty
  ssh-dss [...]

 viewvc lives in /usr/local/viewvc, and relevant configuration
 items are:

  root_parents = /usr/home/svn/repository: svn
  root_as_url_component = 1
  allowed_views = annotate, diff, markup, roots, co, tar
  default_file_view = co
 -

 Please let me know if you'd like more information regarding my
 setup/configuration.

 Thanks in advance!

 --
 Adam Richards
 e:a...@avertech.net | k:0x0BA2643B




-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/

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 alec.kl...@oracle.com:
  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.  

-- 
alec.kl...@oracle.com   Oracle Middleware
PGP key: http://pgp.mit.edu:11371/pks/lookup?op=getsearch=0x432B9956


pgpgB0m70LVTx.pgp
Description: PGP signature

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/blah/blah/blah
 
  The above looks right.
 
   also tried the following variants:
 # based on svn help resolve (uses = in accept argument)
 svn merge --accept=mine-full -c 12345
   https://repository/branches/blah/blah/blah
  
 # trying with single quotes as listed in svn help merge
 svn merge --accept='mine-full' -c 12345
   https://repository/branches/blah/blah/blah
  
 # trying same as beginning, but with single quotes
 svn merge --accept 'mine-full' -c 12345
   https://repository/branches/blah/blah/blah
   with no luck.
  
 
  Can you be more specific? What do you mean by no luck.
 
  Are you getting an error on your command line. Is it not
 accepting your
  files on conflicts?
 Sorry--I meant to add the output from Subversion.  I end up with
 tree conflicts.  The two files were added at different times with
 different contents.  I just want mine to basically overwrite the
 others.  Perhaps I need to add some sort of --ignore-ancestry
 option?

Ok, I'm gonna go out here on a limb (get it tree conflict, limb, anyway) and 
say that auto conflict resolution doesn't apply to a tree conflict. I think to 
resolve a tree conflict you have to manually make the tree in the merge target 
match the merge source. I don't think svn can or will do that for you 
automatically.

BOb