Re: Trouble getting started

2010-08-30 Thread Csaba Raduly
On Sat, Aug 28, 2010 at 11:07 PM, Fred Krogh  wrote:
>  I'm new to subversion or in fact to any version control system and
> evidently have some error in my mind set when reading documents and
> trying to get subversion to work.  I'm using a gentoo linux system and
> believe I have everything necessary installed.  I started with the command
>
> svnadmin create /m/svn/repos
>
> Call that step 1.  Then for step 2 I did
>
> svn import d1func.f90 file:///m/svn/repos/quadrature
>
> and that brings up emacs (my usual editor) with a file called
> svn-commit.tmp, which I type something in, and then close it. That
> didn't seem to get anything into the repository. I want to have a
> project called quadrature and I suspect I'm missing something between
> step 1 and step 2.

Hi Fred,
Was there a message complaining that svn-commit.tmp was not modified ?

Subversion uses svn-commit.tmp int the following way:

1. It writes the skeleton
2. It calls the editor (defined by the environment, commandline, or
configured when svn was built)
3. It waits for the editor to exit
4. It examines svn-commit.tmp

If the editor is the actual emacs executable, this works correctly.
However, if your editor is a
pass-this-filename-to-the-running-instance-and-exit helper, Subversion
reads the file before emacs had a chance to change it. I've seen this
happen with nedit, when EDITOR=nedit-client.

Hope this helps,
Csaba
-- 
Life is complex, with real and imaginary parts.
"Ok, it boots. Which means it must be bug-free and perfect. " -- Linus Torvalds
"People disagree with me. I just ignore them." -- Linus Torvalds


Re: "Can't replace 'x' with a node of a differing type" in merge from trunk

2010-08-30 Thread Stefan Sperling
On Sun, Aug 29, 2010 at 10:09:50AM +0300, Daniel Hershcovich wrote:
> 
> Hello,
> 
> Please read the following message on stackoverflow.com:
> http://stackoverflow.com/questions/3565354/svn-merge-error-merging-trunk-to-branch-and-link-has-been-replaced-with-director
> 
> 
> Could this be a Subversion bug?

No, it's working as designed. The error message clearly states what needs to
be done (remove the offending item, commit, update, then re-run the merge).

It's not a nice design, of course. Efforts are being undertaken to fix this
problem as part of a complete rewrite of the working copy handling code.
The result of which is going to be released in Subversion 1.7.

Stefan


about the installation error of viewvc

2010-08-30 Thread Feng WANG
Hi all

 

I have installed the subversion 1.6.12 (r955767) on
centos5.5, and integrated the subversion into apache httpd service, and I
can visit the repos using http protocol from internet explorer. 

Then I want to view the repos source code online, so I installed the ViewVC
1.1.6. Then I modified the viewvc.conf as follows

 

svn_roots = svnrepos: /var/svn/repos

root_parents = /var/svn : svn

 

when I visit viewvc using explorer, error message displayed as follows.

 

 

An Exception Has Occurred

Python Traceback

 

Traceback (most recent call last):

  File "/usr/local/viewvc-1.2-dev/lib/viewvc.py", line 4443, in main

request.run_viewvc()

  File "/usr/local/viewvc-1.2-dev/lib/viewvc.py", line 398, in run_viewvc

self.view_func(self)

  File "/usr/local/viewvc-1.2-dev/lib/viewvc.py", line 1860, in view_roots

allroots = list_roots(request)

  File "/usr/local/viewvc-1.2-dev/lib/viewvc.py", line 4300, in list_roots

cfg.utilities, cfg.options.svn_config_dir)

  File "/usr/local/viewvc-1.2-dev/lib/vclib/svn/__init__.py", line 53, in
SubversionRepository

import svn_repos

  File "/usr/local/viewvc-1.2-dev/lib/vclib/svn/svn_repos.py", line 24, in ?

from svn import fs, repos, core, client, delta

ImportError: No module named svn 

 

 

I have also installed viewvc1.1.3, the same errors occurred.


 

Does anyone know the reason? Many thanks.

 

 

Best regards,

Feng WANG

 



Re: about the installation error of viewvc

2010-08-30 Thread Andy Levy
On Mon, Aug 30, 2010 at 07:37, Feng WANG  wrote:
> Hi all
>
>
>
>     I have installed the subversion 1.6.12 (r955767) on
> centos5.5, and integrated the subversion into apache httpd service, and I
> can visit the repos using http protocol from internet explorer.
>
> Then I want to view the repos source code online, so I installed the ViewVC
> 1.1.6. Then I modified the viewvc.conf as follows
>
>
>
> svn_roots = svnrepos: /var/svn/repos
>
> root_parents = /var/svn : svn
>
>
>
> when I visit viewvc using explorer, error message displayed as follows.
>
>
>
>
>
> An Exception Has Occurred
>
> Python Traceback
>
>
>
> Traceback (most recent call last):
>
>   File "/usr/local/viewvc-1.2-dev/lib/viewvc.py", line 4443, in main
>
>     request.run_viewvc()
>
>   File "/usr/local/viewvc-1.2-dev/lib/viewvc.py", line 398, in run_viewvc
>
>     self.view_func(self)
>
>   File "/usr/local/viewvc-1.2-dev/lib/viewvc.py", line 1860, in view_roots
>
>     allroots = list_roots(request)
>
>   File "/usr/local/viewvc-1.2-dev/lib/viewvc.py", line 4300, in list_roots
>
>     cfg.utilities, cfg.options.svn_config_dir)
>
>   File "/usr/local/viewvc-1.2-dev/lib/vclib/svn/__init__.py", line 53, in
> SubversionRepository
>
>     import svn_repos
>
>   File "/usr/local/viewvc-1.2-dev/lib/vclib/svn/svn_repos.py", line 24, in ?
>
>     from svn import fs, repos, core, client, delta
>
> ImportError: No module named svn
>
>
>
>
>
>     I have also installed viewvc1.1.3, the same errors occurred.
>
>
>
>     Does anyone know the reason? Many thanks.

Always read your error messages.

> ImportError: No module named svn

You either haven't installed the Python bindings, or have installed
them to a place which Python isn't looking in.


Re: about the installation error of viewvc

2010-08-30 Thread Mark Phippard
Give CollabNet Subversion Edge a try.  It provides a complete stack of
Apache, Subversion and ViewVC that are all pre-configured to work
together.  You also get a web-based UI for configuring and managing
the server:

http://www.open.collab.net/products/subversion/whatsnew.html?cid=sefp0810



On Mon, Aug 30, 2010 at 7:37 AM, Feng WANG  wrote:
> Hi all
>
>
>
>     I have installed the subversion 1.6.12 (r955767) on
> centos5.5, and integrated the subversion into apache httpd service, and I
> can visit the repos using http protocol from internet explorer.
>
> Then I want to view the repos source code online, so I installed the ViewVC
> 1.1.6. Then I modified the viewvc.conf as follows
>
>
>
> svn_roots = svnrepos: /var/svn/repos
>
> root_parents = /var/svn : svn
>
>
>
> when I visit viewvc using explorer, error message displayed as follows.
>
>
>
>
>
> An Exception Has Occurred
>
> Python Traceback
>
>
>
> Traceback (most recent call last):
>
>   File "/usr/local/viewvc-1.2-dev/lib/viewvc.py", line 4443, in main
>
>     request.run_viewvc()
>
>   File "/usr/local/viewvc-1.2-dev/lib/viewvc.py", line 398, in run_viewvc
>
>     self.view_func(self)
>
>   File "/usr/local/viewvc-1.2-dev/lib/viewvc.py", line 1860, in view_roots
>
>     allroots = list_roots(request)
>
>   File "/usr/local/viewvc-1.2-dev/lib/viewvc.py", line 4300, in list_roots
>
>     cfg.utilities, cfg.options.svn_config_dir)
>
>   File "/usr/local/viewvc-1.2-dev/lib/vclib/svn/__init__.py", line 53, in
> SubversionRepository
>
>     import svn_repos
>
>   File "/usr/local/viewvc-1.2-dev/lib/vclib/svn/svn_repos.py", line 24, in ?
>
>     from svn import fs, repos, core, client, delta
>
> ImportError: No module named svn
>
>
>
>
>
>     I have also installed viewvc1.1.3, the same errors occurred.
>
>
>
>     Does anyone know the reason? Many thanks.
>
>
>
>
>
> Best regards,
>
> Feng WANG
>
>



-- 
Thanks

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


Re: SSL handshake failed: SSL error: A TLS warning alert has been received.

2010-08-30 Thread Larry Evans
On 08/27/10 11:39, Larry Evans wrote:
[snip]
> This is the 2nd thread that's mentioned ubuntu's lucid.
> The last post to the other thread is found here:
> 
> http://article.gmane.org/gmane.comp.version-control.subversion.user/99801
> 
> Maybe ubuntu people have some idea what's wrong; however, I've
> already posted a question here:
> 
> http://ubuntuforums.org/showthread.php?t=1561623
> 
> but have gotten no reply :(
The solution to my problem is described here:

http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2402527



RE: Subversion encountered a serious problem - during svn update

2010-08-30 Thread Patrick Fletcher
Hello,

The below is occurring now with Java files also, so it doesn't seem to be
discriminating at all. The only way for me to get around it is to delete
working copy and check out head. Repository has been svnadmin verified.

Is there any information I could give that would be helpful to anyone who
could look at this? I'd love to make the switch to svn, but this is going to
be a show stopper. I haven't been able to find much mention of solutions to
similar problems anywhere. Thanks in advance to anyone who can peek.

Patrick Fletcher
Marquis Software Development
Business Phone: (850) 877-8864 x132
Business Fax: (850) 877-0359

-Original Message-
From: Patrick Fletcher [mailto:patrick.fletc...@marquisware.com] 
Sent: Friday, August 20, 2010 10:34 AM
To: 'users@subversion.apache.org'
Cc: 'Daniel Shahaf'; 'Andy Levy'
Subject: RE: Subversion encountered a serious problem - during svn update

> In the future, could you just type the error messages instead of attaching
jpegs.

Definitely, and I apologize. I am new to using mailing lists and didn't even
think twice about it.

The following error occurred when trying to update a working copy using
Tortoise. The working copy was cleaned up, tried to update again, same
message. Deleting entire working copy and checking out HEAD again had no
problems. I searched the mailing list for related posts and could not find
anything related besides commit messages. Any ideas as to what might have
caused this?

Both working copy and server running svn, version 1.6.3

> Subversion encountered a serious problem.
> Please take the time to report.
>
> Subversion reported the following:
>
> In file
>
'...\TortoiseSVN-1.6.10\ext\subversion\subversion\libsvn_delta\text_delta.c'
> line 657: assertion failed (window->sview_len == 0 ||
(window->sview_offset >= ab->sbuf_offset && (window-> sview_offset +
window->sview_len >= sbuf_offset + ab->sbuf_len)))

A different error (or message) occurred when trying to update through
Subclipse:

Command from Eclipse console:
> update [working copy] -r HEAD --force
Error:
> org.tigris.subversion.javahl.ClientException: svn: Svndiff has
backwards-sliding source views

If this helps at all... looking into this a bit more last week, I found the
culprit that was actually causing the error. It is an xml file that looks
like it has gone back and forth in its revision history. Say a change was
made in revision 3, the next revision may actually be a copy of revision 1
with one alteration. The next change may pull everything from 3 back in,
etc. etc. Should this just not be done? We are actually in the process from
migrating from VSS to SVN (finally!!), so this history is actually coming
from our current VSS repo, which does not have a problem it.

Thanks guys.

Patrick Fletcher
Marquis Software Development
Business Phone: (850) 877-8864 x132
Business Fax: (850) 877-0359




Re: Ubuntu: store user credentials for svn-client

2010-08-30 Thread Larry Evans
On 08/27/10 11:02, Larry Evans wrote:
[snip]
> I can't help but can sympathize.  I found a very similar problem
> after upgrading ubuntu 8.04 -> ubuntu 10.04.
> 
> However, my symptoms were slightly different.  I got the:
> 
>   Could not authenticate
> 
> message but before that I got some query containing "gnome keyring".
> 
> Here's the actual session:
> 
> [CODE]
> ~/prog_dev/boost-svn/ro/sandbox/rw/variadic_templates $ svn commit -m
> "add macro, ARG_CONSTANCY, to test driver"
> Password for '(null)' GNOME keyring:
> svn: Commit failed (details follow):
> svn: MKACTIVITY of
> '/svn/boost/!svn/act/018d0a5a-eee7-49b3-b42e-b5295ef7b8f8':
> authorization failed: Could not authenticate to server: rejected Basic
> challenge (https://svn.boost.org)
> ~/prog_dev/boost-svn/ro/sandbox/rw/variadic_templates $
> [/CODE]
> 
> So, I'd like to echo bebop52's plea for help.
> 
> -Larry
> 
> 
The solution my problem is in:

http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2402527



Hook to check for a presence of file before committing

2010-08-30 Thread Tech Geek
Hi,

I am just getting started with SVN and I am running the latest version of
subversion on a Windows Server. I am looking for a pre-commit.bat hook that
will check for presence of a particular file (say project.xml) before
commiting to the repository. If the working copy that is about to be
committed does not have that file then the commits are rejected else the
commits are accepted.

I tried looking into svnlook command but not sure how to that command to
look for a particular file.

I am using TortoiseSVN client.

Thanks


Re: about the installation error of viewvc

2010-08-30 Thread Nico Kadel-Garcia
On Mon, Aug 30, 2010 at 7:37 AM, Feng WANG  wrote:
> Hi all
>
>
>
>     I have installed the subversion 1.6.12 (r955767) on
> centos5.5, and integrated the subversion into apache httpd service, and I

Use the RPM's at RPMforge for Subversion, and from RPMforge or EPEL
for viewvc. If you're on x86_64 hardware, you may need to manually
install the .i386 package as well to avoid confusing conflicts with
the older packages from CentOS. But this operates beautifully.

Those play very nicely together.


Re: about the installation error of viewvc

2010-08-30 Thread Les Mikesell

On 8/30/2010 1:03 PM, Nico Kadel-Garcia wrote:

On Mon, Aug 30, 2010 at 7:37 AM, Feng WANG  wrote:

Hi all



 I have installed the subversion 1.6.12 (r955767) on
centos5.5, and integrated the subversion into apache httpd service, and I


Use the RPM's at RPMforge for Subversion, and from RPMforge or EPEL
for viewvc. If you're on x86_64 hardware, you may need to manually
install the .i386 package as well to avoid confusing conflicts with
the older packages from CentOS. But this operates beautifully.

Those play very nicely together.


I believe there is a difference in the config location between the 
RPMforge and EPEL packages for viewvc, so you do have to be careful that 
updates don't happen from a different repository than the initial install.


--
  Les Mikesell
   lesmikes...@gmail.com



question on svn list

2010-08-30 Thread Charles Li
windows server 2003
repoository root -> e:\svn\repos
cotsvn points to e:\svn\repos

repositories: -> e:\svn\repos\fms and e:\svn\repos\hrms

when I try to do a svn list on the root node, I only get:

C:\Program Files\SlikSvn\bin>svn list https://cothubt1.com:7580/cotsvn/
svn: OPTIONS of 'https://cothubt1.com:7580/cotsvn': 200 OK (https://
cothubt1.com:7580)

I would like it to list hrms and fms when listing from the root repository 
location.

thanks.




Re: question on svn list

2010-08-30 Thread Ryan Schmidt
On Aug 30, 2010, at 16:19, Charles Li wrote:

> windows server 2003
> repoository root -> e:\svn\repos
> cotsvn points to e:\svn\repos
> 
> repositories: -> e:\svn\repos\fms and e:\svn\repos\hrms
> 
> when I try to do a svn list on the root node, I only get:
> 
> C:\Program Files\SlikSvn\bin>svn list https://cothubt1.com:7580/cotsvn/
> svn: OPTIONS of 'https://cothubt1.com:7580/cotsvn': 200 OK (https://
> cothubt1.com:7580)
> 
> I would like it to list hrms and fms when listing from the root repository 
> location.

I'm sorry, that feature is not available. You can only see the list of 
repositories in a web browser, not in a Subversion client. (And that assumes 
you've added "SVNListParentPath on" to your Apache configuration.)




Re: Hook to check for a presence of file before committing

2010-08-30 Thread Ryan Schmidt
On Aug 30, 2010, at 12:50, Tech Geek wrote:

> I am just getting started with SVN and I am running the latest version of 
> subversion on a Windows Server. I am looking for a pre-commit.bat hook that 
> will check for presence of a particular file (say project.xml) before 
> commiting to the repository. If the working copy that is about to be 
> committed does not have that file then the commits are rejected else the 
> commits are accepted.
>  
> I tried looking into svnlook command but not sure how to that command to look 
> for a particular file.

Subversion hook scripts run on the server, not the client, so they have no 
knowledge of the user's working copy. So there's no way to do what you want 
using Subversion's server-side hook scripts.


> I am using TortoiseSVN client.

I believe TortoiseSVN has client-side hook scripts that are separate from 
Subversion's server-side hook scripts. Perhaps you can do what you want that 
way. Even if you could, that would require all your users to use TortoiseSVN, 
and they could simply bypass the restriction by using another client.





Re: Hook to check for a presence of file before committing

2010-08-30 Thread Ryan Schmidt
You should use Reply All so your replies go to the mailing list too, not just 
to me.


On Aug 30, 2010, at 19:32, Tech Geek wrote:

> Ryan,
>  
>> Subversion hook scripts run on the server, not the client, so they have no 
>> knowledge of the user's working copy. So there's no way to do what you want 
>> using Subversion's server-side hook scripts.
> 
> I see. How about this - I check for that particular file in post-commit hook 
> and then if the file is missing then I can send an email. I think this will 
> be a reasonably acceptable solution for my requirement.
>  
> So how do I check for a file after commit using svnlook?

In hook scripts, people commonly use "svnlook changed", but that only tells you 
what files changed in a revision, or in a transaction. It does not tell you 
what is in the HEAD of the repository, and it does not tell you what is in the 
user's working copy. So unless your requirement is that the user modify your 
project.xml file with every commit, this will not help you.

Perhaps if you explain why you want to check for the existence of this file in 
the working copy we can help you find a different way of going about it.




Re: Hook to check for a presence of file before committing

2010-08-30 Thread Tech Geek
>Perhaps if you explain why you want to check for the existence of this file
in the working copy we can help you find a different way of >going about it.
OK. Let me try to explain this.
The code that we are trying to commit is generated by an IDE - a software
development tool. The particular file (project.xml) is usually an optional
file that is up to the developers/user to generate. However we would like to
enforce a policy where all the developers before they commit their changes
make sure that the project.xml is also generated and then only a successful
commit occurs.

Does this help?


Re: Hook to check for a presence of file before committing

2010-08-30 Thread David Weintraub
On Mon, Aug 30, 2010 at 8:46 PM, Tech Geek  wrote:
>>Perhaps if you explain why you want to check for the existence of this file
>> in the working copy we can help you find a different way of >going about it.
> OK. Let me try to explain this.
> The code that we are trying to commit is generated by an IDE - a software
> development tool. The particular file (project.xml) is usually an optional
> file that is up to the developers/user to generate. However we would like to
> enforce a policy where all the developers before they commit their changes
> make sure that the project.xml is also generated and then only a successful
> commit occurs.
>
> Does this help?

You usually don't commit generated artifacts, but the base source
artifacts that are used to generate your artifacts. For example, is
there a project file that your IDE uses to generate the code? If so,
you may want to commit that instead.

It is possible to verify that a project.xml is one of the files being
committed because you can use "svn changed" at the time of the
transaction to see what files are being added or modified. It would be
possible to fail the transaction if svnlook changed doesn't have a
project.xml file in the list.

I would suggest you use Python or Perl as your hook script language.
One of the advantages of a server side hook is that it only has to run
on a single machine (the server). A scripting language like Python or
Perl is a bit more flexible for writing hooks than Batch or even Power
Shell.


-- 
David Weintraub
qazw...@gmail.com