Re: how to migrate svn directory

2010-09-01 Thread Ulrich Eckhardt
On Wednesday 01 September 2010, Yunlong Wang wrote:
> my team need to migrate our working svn directory from server A to
> another server B, is there any tool or suggestions?

Wait: "working copies" are scrap space for editing, which you create when 
needed and throw away after use. "repositories" are databases that contain 
the files including their history. This just to get the terminology right, 
because I'm not sure which of the two you mean.

If you mean the working copy, then I wouldn't bother, as it also doesn't 
contain the logs you want to preserve. Also, typically every developer has 
their own working copy or even multiple working copies. In most cases, you 
could simply copy over the existing working copy to the new machine, the 
exception being when the new machine has an older version of the SVN client.

If you mean the repository, which is what contains the "valuable" data and the 
history, then there is a whole chapter which Ryan gave you. I'd just like to 
add something for you to think about: What if the machine had crashed? The 
point is that a migration is similar to a recovery procedure after a crash, 
and being able to do that should be part of your company's backup plan.

Cheers!

Uli

-- 
ML: http://subversion.tigris.org/mailing-list-guidelines.html
FAQ: http://subversion.tigris.org/faq.html
Docs: http://svnbook.red-bean.com/

Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932

**
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**
   Visit our website at 
**
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten 
bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen 
Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein 
sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, 
weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte 
Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht 
verantwortlich.
**



Re: how to migrate svn directory

2010-09-01 Thread Ryan Schmidt
Please respond to the list as well, not just to me. Usually this is done using 
the Reply All feature in your email program. See more comments below.


On Sep 1, 2010, at 02:26, Yunlong Wang wrote:

> 2010/9/1 Ryan Schmidt
> 
>> On Sep 1, 2010, at 01:12, Yunlong Wang wrote:
>> 
>>> my team need to migrate our working svn directory from server A to another 
>>> server B, is there any tool or suggestions?
>> 
>> http://svnbook.red-bean.com/en/1.5/svn.reposadmin.maint.html#svn.reposadmin.maint.migrate
> 
> thanks a lot.
> I'm reading it and trying.
> It's seems like I should use :
> svnadmin dump xxx
> svndumpfilter
> edit the root path of dumfile
> svnimport
> 
> Is that the right way?


That sounds ok, except it's "svnadmin load"; there is no such thing as 
"svnimport".

If you don't want to change the path within the repository, you can skip the 
filtering steps.




authz File ignored?

2010-09-01 Thread drindt
Hello,

i am using SVN via mod_dav_svn in apache. The user authentification is 
processed via NTLM. Later wehen the user is authenticated, i would like to have 
a authz file what ensures, that the person is permitted to access the svn 
repository and path. The configuration:
=== 8< ===

  DocumentRoot /export/home/svn-test/repository
  ServerName svn-repository.intern.x.de
  
AuthName "ZVD-Wiki"
AuthType NTLM
NTLMAuth on
NTLMAuthoritative off
NTLMDomain x_x
NTLMServer x-x
NTLMBackup x-x
NTLMBasicAuth on
Require valid-user
Options +Indexes
Satisfy Any
DAV svn
SVNParentPath /export/home/svn-test/repository
AuthzSVNAccessFile "/export/home/svn-test/repository/my.authz"
Order allow,deny
Allow from all
  


=== 8< ===
The configuration is working so far. Not working is that the authenticated user 
got no access denied when he wants accessing folders in projects whats not in 
the authz. The truss command also told me that no one access the 
/export/home/svn-test/repository/my.authz file.

I am very thankful for your support.
Thanks
Daniel



Re: authz File ignored?

2010-09-01 Thread Konstantin Kolinko
Hi!

You are using

>Satisfy Any

and

>Order allow,deny
>Allow from all

thus accessing from any IP address is sufficient to satisfy the
checks. Thus, no need to validate the user.

http://httpd.apache.org/docs/2.2/mod/core.html#satisfy

Use Satisfy All  instead.

Best regards,
Konstantin Kolinko

2010/9/1  :
> Hello,
>
> i am using SVN via mod_dav_svn in apache. The user authentification is 
> processed via NTLM. Later wehen the user is authenticated, i would like to 
> have a authz file what ensures, that the person is permitted to access the 
> svn repository and path. The configuration:
> (...)
> The configuration is working so far. Not working is that the authenticated 
> user got no access denied when he wants accessing folders in projects whats 
> not in the authz. The truss command also told me that no one access the 
> /export/home/svn-test/repository/my.authz file.
>
> I am very thankful for your support.
> Thanks
> Daniel
>
>


Re: An issue about SVN access deny

2010-09-01 Thread Johan Corveleyn
2010/9/1 alinagra 
>
> Hi, buddies,
>
> I have setup a SVN server and use SASL authentication. But right now I have a 
> authz question:
> I add authentication control the folder: /trunk/access, and only the account 
> TIM can access this folder.
>
> I can create tags with accont TIM, but when I try to create a tag with other 
> accounts, it reports "access denied" error.
> and if I delete these lines below in the authz file, other accounts can 
> create tags.
>
> [test:/trunk/access]
> @aa = rw
> * =

Do you mean that the other accounts want to create tags of
/trunk/access? In that case they need at least read access, so you
should change
* =
to:
* = r

in the above rule.

--
Johan


Re:Re: An issue about SVN access deny

2010-09-01 Thread alinagra
Hi, Johan,
Thanks for your reply!

I want to create tag for /trunk, and the accounts expept TIM do not have access 
right to the /trunk/access folder, in another words, the /trunk/access folder 
is invisible for all other accounts.
I have tried sevral times, and it seems if a user do not have access right to a 
subfolder, he can not create a tag for this folder.
Am I right ? or anyone has some solution?

Thanks!




At 2010-09-01 16:36:17,"Johan Corveleyn"  wrote:

>2010/9/1 alinagra 
>>
>> Hi, buddies,
>>
>> I have setup a SVN server and use SASL authentication. But right now I have 
>> a authz question:
>> I add authentication control the folder: /trunk/access, and only the account 
>> TIM can access this folder.
>>
>> I can create tags with accont TIM, but when I try to create a tag with other 
>> accounts, it reports "access denied" error.
>> and if I delete these lines below in the authz file, other accounts can 
>> create tags.
>>
>> [test:/trunk/access]
>> @aa = rw
>> * =
>
>Do you mean that the other accounts want to create tags of
>/trunk/access? In that case they need at least read access, so you
>should change
>* =
>to:
>* = r
>
>in the above rule.
>
>--
>Johan


Re:Re: please help about SVN authentication

2010-09-01 Thread alinagra
Here is the repo arch:

/trunk
/folder a
/folder b

/folder c
/access

/tag

I think this is the most common case, and it seems if one doesn't have access 
right, he can not create a tag for /trunk.
or is there something wrong with my configuration?

At 2010-09-01 14:11:07,"Erik Andersson"  wrote:



2010/9/1 alinagra
Hi, buddies,

I have setup a SVN server and  I use SASL authentication. But right now I have 
a authz question:
I can create tags with accont TIM, but when I try to create a tag with the 
account not  jim, it reports "access denied" error.

Where do you create tags? 
Does anyone know why? Thanks in advance

Here is my authz file:
### This file is an example authorization file for svnserve.
### Its format is identical to that of mod_authz_svn authorization
### files.
### As shown below each section defines authorizations for the path and
### (optional) repository specified by the section name.
### The authorizations follow. An authorization line can refer to:
###  - a single user,
###  - a group of users defined in a special [groups] section,
###  - an alias defined in a special [aliases] section,
###  - all authenticated users, using the '$authenticated' token,
###  - only anonymous users, using the '$anonymous' token,
###  - anyone, using the '*' wildcard.
###
### A match can be inverted by prefixing the rule with '~'. Rules can
### grant read ('r') access, read-write ('rw') access, or no access
### ('').

[groups]
# harry_and_sally = harry,sally
aa = TIM

[test:/]
* = rw

[test:/trunk/access]
@aa = rw
* =   



and here is the svnserve.conf:
### This file controls the configuration of the svnserve daemon, if you
### use it to allow access to this repository.  (If you only allow
### access through http: and/or file: URLs, then this file is
### irrelevant.)

### Visithttp://subversion.tigris.org/ for more information.

[general]
### These options control access to the repository for unauthenticated
### and authenticated users.  Valid values are "write", "read",
### and "none".  The sample settings below are the defaults.
anon-access = none
auth-access = write
### The password-db option controls the location of the password
### database file.  Unless you specify a path starting with a /,
### the file's location is relative to the directory containing
### this configuration file.
### If SASL is enabled (see below), this file will NOT be used.
### Uncomment the line below to use the default password file.
#password-db = passwd
### The authz-db option controls the location of the authorization
### rules for path-based access control.  Unless you specify a path
### starting with a /, the file's location is relative to the the
### directory containing this file.  If you don't specify an
### authz-db, no path-based access control is done.
### Uncomment the line below to use the default authorization file.
authz-db = authz
### This option specifies the authentication realm of the repository.
### If two repositories have the same authentication realm, they should
### have the same password database, and vice versa.  The default realm
### is repository's uuid.
realm = dreamlink

[sasl]
### This option specifies whether you want to use the Cyrus SASL
### library for authentication. Default is false.
### This section will be ignored if svnserve is not built with Cyrus
### SASL support; to check, run 'svnserve --version' and look for a line
### reading 'Cyrus SASL authentication is available.'
use-sasl = true
### These options specify the desired strength of the security layer
### that you want SASL to provide. 0 means no encryption, 1 means
### integrity-checking only, values larger than 1 are correlated
### to the effective key length for encryption (e.g. 128 means 128-bit
### encryption). The values below are the defaults.
min-encryption = 128
max-encryption = 256



您想拥有和网易免费邮箱一样强大的软件吗?



Re: Re: please help about SVN authentication

2010-09-01 Thread Erik Andersson
2010/9/1 alinagra 

> Here is the repo arch:
>
> /trunk
> /folder a
> /folder b
> /folder c
> /access
>
> /tag
>
> I think this is the most common case, and it seems if one doesn't have
> access right, he can not create a tag for /trunk.
> or is there something wrong with my configuration?


Are you using the SVNParentPath or SVNPath directive?
Can you show us your Subversion section for Apache?


>
> At 2010-09-01 14:11:07,"Erik Andersson"  wrote:
>
>
>
> 2010/9/1 alinagra 
>
>> Hi, buddies,
>>
>> I have setup a SVN server and  I use SASL authentication. But right now I
>> have a authz question:
>> I can create tags with accont TIM, but when I try to create a tag with the
>> account not  jim, it reports "access denied" error.
>>
> Where do you create tags?
>
>> Does anyone know why? Thanks in advance
>>
>> Here is my authz file:
>> ### This file is an example authorization file for svnserve.
>> ### Its format is identical to that of mod_authz_svn authorization
>> ### files.
>> ### As shown below each section defines authorizations for the path and
>> ### (optional) repository specified by the section name.
>> ### The authorizations follow. An authorization line can refer to:
>> ###  - a single user,
>> ###  - a group of users defined in a special [groups] section,
>> ###  - an alias defined in a special [aliases] section,
>> ###  - all authenticated users, using the '$authenticated' token,
>> ###  - only anonymous users, using the '$anonymous' token,
>> ###  - anyone, using the '*' wildcard.
>> ###
>> ### A match can be inverted by prefixing the rule with '~'. Rules can
>> ### grant read ('r') access, read-write ('rw') access, or no access
>> ### ('').
>>
>> [groups]
>> # harry_and_sally = harry,sally
>> aa = TIM
>>
>> [test:/]
>> * = rw
>>
>> [test:/trunk/access]
>> @aa = rw
>> * =
>
>
>>
>>
>>
>> and here is the svnserve.conf:
>> ### This file controls the configuration of the svnserve daemon, if you
>> ### use it to allow access to this repository.  (If you only allow
>> ### access through http: and/or file: URLs, then this file is
>> ### irrelevant.)
>>
>> ### Visit http://subversion.tigris.org/ for more information.
>>
>> [general]
>> ### These options control access to the repository for unauthenticated
>> ### and authenticated users.  Valid values are "write", "read",
>> ### and "none".  The sample settings below are the defaults.
>> anon-access = none
>> auth-access = write
>> ### The password-db option controls the location of the password
>> ### database file.  Unless you specify a path starting with a /,
>> ### the file's location is relative to the directory containing
>> ### this configuration file.
>> ### If SASL is enabled (see below), this file will NOT be used.
>> ### Uncomment the line below to use the default password file.
>> #password-db = passwd
>> ### The authz-db option controls the location of the authorization
>> ### rules for path-based access control.  Unless you specify a path
>> ### starting with a /, the file's location is relative to the the
>> ### directory containing this file.  If you don't specify an
>> ### authz-db, no path-based access control is done.
>> ### Uncomment the line below to use the default authorization file.
>> authz-db = authz
>> ### This option specifies the authentication realm of the repository.
>> ### If two repositories have the same authentication realm, they should
>> ### have the same password database, and vice versa.  The default realm
>> ### is repository's uuid.
>> realm = dreamlink
>>
>> [sasl]
>> ### This option specifies whether you want to use the Cyrus SASL
>> ### library for authentication. Default is false.
>> ### This section will be ignored if svnserve is not built with Cyrus
>> ### SASL support; to check, run 'svnserve --version' and look for a line
>> ### reading 'Cyrus SASL authentication is available.'
>> use-sasl = true
>> ### These options specify the desired strength of the security layer
>> ### that you want SASL to provide. 0 means no encryption, 1 means
>> ### integrity-checking only, values larger than 1 are correlated
>> ### to the effective key length for encryption (e.g. 128 means 128-bit
>> ### encryption). The values below are the defaults.
>> min-encryption = 128
>> max-encryption = 256
>>
>>
>> --
>> 您想拥有和网易免费邮箱一样强大的软件吗? 
>
>
>
>
> --
> 网易邮箱,没有垃圾邮件的邮箱。 


hint of the day

2010-09-01 Thread Jeremy Mordkoff
Just an FYI for anyone that does merging.

I just spent an hour cleaning up a mess with my mergeinfo's. I missed a hint 
that I was about to do something really stupid. 

Here's the merge: 


[rele...@zaz1 rel_2_5]$ svn merge $B/rel_2_5_3
--- Merging r14352 through r14594 into '.':
Ulcast/build/images/nand/root/lcast/etc/post_install.sh
Ulcast/build/images/nand/root/lcast/etc/lc_UpdateNOR.sh
 G   .
[rele...@zaz1 rel_2_5]$ svn commit -m 'merge from rel_2_5_3 of a fix made in 
trunk'
Sending.
Sendinglcast/build/images/nand/root/lcast/etc/lc_UpdateNOR.sh
Sendinglcast/build/images/nand/root/lcast/etc/post_install.sh
Transmitting file data ..
Committed revision 14595.


The hint I missed was the G next to the '.'. That should have told me that 
there were changes in my workspace, and since I never knowingly commit local 
changes and merges at the same time, I should have stopped right there.

Also, I have some tools that I use to keep track of branches and stuff. Is 
there a good place to publish them? 

JLM


Re: hint of the day

2010-09-01 Thread Erik Andersson
On Wed, Sep 1, 2010 at 2:11 PM, Jeremy Mordkoff  wrote:

>  Just an FYI for anyone that does merging.
>
> I just spent an hour cleaning up a mess with my mergeinfo's. I missed a
> hint that I was about to do something really stupid.
>
> Here's the merge:
>
>
> [rele...@zaz1 rel_2_5]$ svn merge $B/rel_2_5_3
> --- Merging r14352 through r14594 into '.':
> Ulcast/build/images/nand/root/lcast/etc/post_install.sh
> Ulcast/build/images/nand/root/lcast/etc/lc_UpdateNOR.sh
>  G   .
> [rele...@zaz1 rel_2_5]$ svn commit -m 'merge from rel_2_5_3 of a fix made
> in trunk'
> Sending.
> Sendinglcast/build/images/nand/root/lcast/etc/lc_UpdateNOR.sh
> Sendinglcast/build/images/nand/root/lcast/etc/post_install.sh
> Transmitting file data ..
> Committed revision 14595.
>
>
> The hint I missed was the G next to the '.'. That should have told me that
> there were changes in my workspace, and since I never knowingly commit local
> changes and merges at the same time, I should have stopped right there.
>
> Also, I have some tools that I use to keep track of branches and stuff. Is
> there a good place to publish them?
>
I'd like to see them very much. If you don't publish them anywhere, please
send them my way.

Cheers / Erik

>
> JLM
>


Re: Merge scripts

2010-09-01 Thread Erik Andersson
Hi

Following up on this since I didn't recieve any feedback of any kind. I'd
like to give it one more try..

Cheers / Erik

On Fri, Feb 19, 2010 at 12:26 PM, Erik Andersson  wrote:

> Hi
>
> Have anyone already created some scripts for making life easier using svn
> 1.6 merge tracking and are willing to share?
>
> I want a replacement for svnmerge.py avail -l
> Something like:
> svnAvail.py -S 
> Running: svn mergeinfo  --show-revs eligible | xargs -I {} svn log
> -v  -{}
>
> I'd like a script for merging trunk to a branch
> rebase.py
> 1. shows available changsets with log
> 2. asks if you want to merge the available changesets
> 3. merges changes from ../../trunk (unless --trunk|-T  is specified)
> (req's a /module/branches|trunk structure setup)
> 4. asks to commit, unless conflicts are found
>
> And a script to reintegrate branches and recording the reintegrate
> changeset as record-only in the branch)
> reintegrate.py --branch|-B 
> 1. shows available changes in the branch
> 2. asks if you want to merge
> 3. merges changes from the branch
> 4. asks to commit, unless conflicts are found
> 5. record the trunk commit as record-only
>   5.1. cd 
>   5.2. svn merge -c X --record-only
>   5.3  svn ci -m"#1234 blocking merge of  to trunk"
>
> Something like this..
>
> Ps. I apologize if this already have been resolved and my google skills
> failed me. Ds.
>
> Cheers / Erik
>


edit log message after commit

2010-09-01 Thread Petra Langebroek
Hello,

I am using an relatively old version of subversion (1.3.1) and would like to 
edit a log file that I already committed to the main repository.
The normal solutions of changing the properties

svn propedit -r N --revprop svn:log URL 

or

svnadmin setlog -r  --bypass-hooks  

dont work, because this version had no "hooks" directory.

Any help is greatly appreciated!

Petra Langebroek



Re: edit log message after commit

2010-09-01 Thread Andy Levy
On Wed, Sep 1, 2010 at 06:31, Petra Langebroek  wrote:
> Hello,
>
> I am using an relatively old version of subversion (1.3.1) and would like to 
> edit a log file that I already committed to the main repository.
> The normal solutions of changing the properties
>
> svn propedit -r N --revprop svn:log URL
>
> or
>
> svnadmin setlog -r  --bypass-hooks 
>
> dont work, because this version had no "hooks" directory.
>
> Any help is greatly appreciated!

Subversion has had hook scripts since before 1.3. Why does your
repository not have a "hooks" directory at all? Did you delete it?
What is the *actual* error message you get - please don't just say "it
doesn't work" - there should be a useful error message returned.


Re: edit log message after commit

2010-09-01 Thread Andy Levy
Please don't reply directly to me. Use Reply to All to reply to the
mailing list.

On Wed, Sep 1, 2010 at 09:38, Petra Langebroek  wrote:
>
> On 1 Sep 2010, at 3:27 PM, Andy Levy wrote:
>
> On Wed, Sep 1, 2010 at 06:31, Petra Langebroek 
> wrote:
>
> Hello,
>
> I am using an relatively old version of subversion (1.3.1) and would like to
> edit a log file that I already committed to the main repository.
>
> The normal solutions of changing the properties
>
> svn propedit -r N --revprop svn:log URL
>
> or
>
> svnadmin setlog -r  --bypass-hooks 
>
> dont work, because this version had no "hooks" directory.
>
> Any help is greatly appreciated!
>
> Subversion has had hook scripts since before 1.3. Why does your
> repository not have a "hooks" directory at all? Did you delete it?
> What is the *actual* error message you get - please don't just say "it
> doesn't work" - there should be a useful error message returned.
>
>
> I have no clue why I don't have this hooks directory, I never deleted it.
> Maybe because I did not set up the initial project, only joined an already
> existing project, and just "checkout" the project?

Hooks are on the server, not in your working copy. They reside in the
same directory as the repository.

> If I type:
> svn propset svn:log "Added wisosw_d as input file" -r65 --revprop
> Error:
> svn: DAV request failed; it's possible that the repository's
> pre-revprop-change hook either failed or is non-existent
> svn: At least one property change failed; repository is unchanged
> If I type:
> svnadmin setlog -r 65 --bypass-hooks newlog.txt
> (Where newlog.txt is "Added wisosw_d as input file".)
> Error:
> svnadmin: Exactly one file argument required

What does svnadmin setlog take for parameters (I haven't had 1.3
around for years, so I don't recall)? svnadmin help setlog


Re: edit log message after commit

2010-09-01 Thread Petra Langebroek

On 1 Sep 2010, at 4:22 PM, Andy Levy wrote:

> Please don't reply directly to me. Use Reply to All to reply to the
> mailing list.
> 
> On Wed, Sep 1, 2010 at 09:38, Petra Langebroek  
> wrote:
>> 
>> On 1 Sep 2010, at 3:27 PM, Andy Levy wrote:
>> 
>> On Wed, Sep 1, 2010 at 06:31, Petra Langebroek 
>> wrote:
>> 
>> Hello,
>> 
>> I am using an relatively old version of subversion (1.3.1) and would like to
>> edit a log file that I already committed to the main repository.
>> 
>> The normal solutions of changing the properties
>> 
>> svn propedit -r N --revprop svn:log URL
>> 
>> or
>> 
>> svnadmin setlog -r  --bypass-hooks 
>> 
>> dont work, because this version had no "hooks" directory.
>> 
>> Any help is greatly appreciated!
>> 
>> Subversion has had hook scripts since before 1.3. Why does your
>> repository not have a "hooks" directory at all? Did you delete it?
>> What is the *actual* error message you get - please don't just say "it
>> doesn't work" - there should be a useful error message returned.
>> 
>> 
>> I have no clue why I don't have this hooks directory, I never deleted it.
>> Maybe because I did not set up the initial project, only joined an already
>> existing project, and just "checkout" the project?
> 
> Hooks are on the server, not in your working copy. They reside in the
> same directory as the repository.

Ok, maybe that is the problem: my repository is at a website.

> 
>> If I type:
>> svn propset svn:log "Added wisosw_d as input file" -r65 --revprop
>> Error:
>> svn: DAV request failed; it's possible that the repository's
>> pre-revprop-change hook either failed or is non-existent
>> svn: At least one property change failed; repository is unchanged
>> If I type:
>> svnadmin setlog -r 65 --bypass-hooks newlog.txt
>> (Where newlog.txt is "Added wisosw_d as input file".)
>> Error:
>> svnadmin: Exactly one file argument required
> 
> What does svnadmin setlog take for parameters (I haven't had 1.3
> around for years, so I don't recall)? svnadmin help setlog

svnadmin help setlog:

setlog: usage: svnadmin setlog REPOS_PATH -r REVISION FILE

Set the log-message on revision REVISION to the contents of FILE.  Use
--bypass-hooks to avoid triggering the revision-property-related hooks
(for example, if you do not want an email notification sent
from your post-revprop-change hook, or because the modification of
revision properties has not been enabled in the pre-revprop-change
hook).

NOTE: revision properties are not historied, so this command
will permanently overwrite the previous log message.

Valid options:
  -r [--revision] arg  : specify revision number ARG (or X:Y range)
  --bypass-hooks   : bypass the repository hook system


I tried:
svnadmin setlog http://aforge.awi.de/svn/echam5iso -r 65 --bypass-hooks 
newlog.txt

Error:
svnadmin: 'http://aforge.awi.de/svn/echam5iso' is an URL when it should be a 
path

Indeed it is an ULR, but I never used a path.

"svn info" gives:

Path: .
URL: http://aforge.awi.de/svn/echam5iso
Repository Root: http://aforge.awi.de/svn/echam5iso
etc.





Re: edit log message after commit

2010-09-01 Thread Andy Levy
On Wed, Sep 1, 2010 at 11:00, Petra Langebroek  wrote:
>
> On 1 Sep 2010, at 4:22 PM, Andy Levy wrote:
>
>> Please don't reply directly to me. Use Reply to All to reply to the
>> mailing list.
>>
>> On Wed, Sep 1, 2010 at 09:38, Petra Langebroek  
>> wrote:
>>>
>>> On 1 Sep 2010, at 3:27 PM, Andy Levy wrote:
>>>
>>> On Wed, Sep 1, 2010 at 06:31, Petra Langebroek 
>>> wrote:
>>>
>>> Hello,
>>>
>>> I am using an relatively old version of subversion (1.3.1) and would like to
>>> edit a log file that I already committed to the main repository.
>>>
>>> The normal solutions of changing the properties
>>>
>>> svn propedit -r N --revprop svn:log URL
>>>
>>> or
>>>
>>> svnadmin setlog -r  --bypass-hooks 
>>>
>>> dont work, because this version had no "hooks" directory.
>>>
>>> Any help is greatly appreciated!
>>>
>>> Subversion has had hook scripts since before 1.3. Why does your
>>> repository not have a "hooks" directory at all? Did you delete it?
>>> What is the *actual* error message you get - please don't just say "it
>>> doesn't work" - there should be a useful error message returned.
>>>
>>>
>>> I have no clue why I don't have this hooks directory, I never deleted it.
>>> Maybe because I did not set up the initial project, only joined an already
>>> existing project, and just "checkout" the project?
>>
>> Hooks are on the server, not in your working copy. They reside in the
>> same directory as the repository.
>
> Ok, maybe that is the problem: my repository is at a website.
>
>>
>>> If I type:
>>> svn propset svn:log "Added wisosw_d as input file" -r65 --revprop
>>> Error:
>>> svn: DAV request failed; it's possible that the repository's
>>> pre-revprop-change hook either failed or is non-existent
>>> svn: At least one property change failed; repository is unchanged
>>> If I type:
>>> svnadmin setlog -r 65 --bypass-hooks newlog.txt
>>> (Where newlog.txt is "Added wisosw_d as input file".)
>>> Error:
>>> svnadmin: Exactly one file argument required
>>
>> What does svnadmin setlog take for parameters (I haven't had 1.3
>> around for years, so I don't recall)? svnadmin help setlog
>
> svnadmin help setlog:
>
> setlog: usage: svnadmin setlog REPOS_PATH -r REVISION FILE
>
> Set the log-message on revision REVISION to the contents of FILE.  Use
> --bypass-hooks to avoid triggering the revision-property-related hooks
> (for example, if you do not want an email notification sent
> from your post-revprop-change hook, or because the modification of
> revision properties has not been enabled in the pre-revprop-change
> hook).
>
> NOTE: revision properties are not historied, so this command
> will permanently overwrite the previous log message.
>
> Valid options:
>  -r [--revision] arg      : specify revision number ARG (or X:Y range)
>  --bypass-hooks           : bypass the repository hook system
>
>
> I tried:
> svnadmin setlog http://aforge.awi.de/svn/echam5iso -r 65 --bypass-hooks 
> newlog.txt
>
> Error:
> svnadmin: 'http://aforge.awi.de/svn/echam5iso' is an URL when it should be a 
> path
>
> Indeed it is an ULR, but I never used a path.

svnadmin can only be used with a local file path. It cannot take URLs.
If you do not have shell access to the server, you can't use svnadmin.

Or you could install a pre-revprop-change hook to allow you to do it
via svn propset --revprop


Mark file with svn:eol-style as binary

2010-09-01 Thread Semen Vadishev
 Hello,

The following behavior seems to be unexpected.

1. Set 'native' EOL style on file:

$  svn ps svn:eol-style native file
property 'svn:eol-style' set on 'file'

2. Mark this file as binary:

$  svn ps svn:mime-type application/octet-stream file
property 'svn:mime-type' set on 'file'

I believe the behavior is unexpected since svn refuses to do the same
steps in reverse order.

$  svn ps svn:mime-type application/octet-stream file
property 'svn:mime-type' set on 'file'

$  svn ps svn:eol-style native file
svn: File 'file' has binary mime type property

The described above is reproducible with subversion build from 1.6.x
branch sources:

$ svn --version
svn, version 1.6.13 (dev build)

-- 
Semen Vadishev,
TMate Software,
http://svnkit.com/ - Java [Sub]Versioning Library!
http://sqljet.com/ - Java SQLite Library!



RE: Mark file with svn:eol-style as binary

2010-09-01 Thread Bob Archer
> The following behavior seems to be unexpected.
> 
> 1. Set 'native' EOL style on file:
> 
> $  svn ps svn:eol-style native file
> property 'svn:eol-style' set on 'file'
> 
> 2. Mark this file as binary:
> 
> $  svn ps svn:mime-type application/octet-stream file
> property 'svn:mime-type' set on 'file'
> 
> I believe the behavior is unexpected since svn refuses to do the
> same
> steps in reverse order.
> 
> $  svn ps svn:mime-type application/octet-stream file
> property 'svn:mime-type' set on 'file'
> 
> $  svn ps svn:eol-style native file
> svn: File 'file' has binary mime type property
> 
> The described above is reproducible with subversion build from
> 1.6.x
> branch sources:
> 
> $ svn --version
> svn, version 1.6.13 (dev build)

svn:eol-style and svn:mime-type application/octet-stream are pretty much 
mutually exclusive. 

Which is why it tells you not to set an eol-style on a binary file. 

Are you saying you want it to not allow setting a file as binary if it has an 
eol-style set?

BOb



RE: Re: please help about SVN authentication

2010-09-01 Thread Bob Archer
> 2010/9/1 alinagra 
> Here is the repo arch:
> 
> /trunk
>     /folder a
>     /folder b
>     /folder c
>     /access
> 
> /tag
> 
> I think this is the most common case, and it seems if one doesn't
> have access right, he can not create a tag for /trunk.
> or is there something wrong with my configuration?
> 
> Are you using the SVNParentPath or SVNPath directive?
> Can you show us your Subversion section for Apache?
> 

I think this is a known issue that has been fixed and will release in 1.6.13.

BOb



Re: Mark file with svn:eol-style as binary

2010-09-01 Thread Semen Vadishev
 Hello Bob,

> Are you saying you want it to not allow setting a file as binary if it has an 
> eol-style set?
Yes. And the reason for that is refusing to set eol-style on binary
file, which makes sense.

Semen Vadishev,
TMate Software,
http://svnkit.com/ - Java [Sub]Versioning Library!
http://sqljet.com/ - Java SQLite Library!


On 01.09.10 19:42, Bob Archer wrote:
>> The following behavior seems to be unexpected.
>>
>> 1. Set 'native' EOL style on file:
>>
>> $  svn ps svn:eol-style native file
>> property 'svn:eol-style' set on 'file'
>>
>> 2. Mark this file as binary:
>>
>> $  svn ps svn:mime-type application/octet-stream file
>> property 'svn:mime-type' set on 'file'
>>
>> I believe the behavior is unexpected since svn refuses to do the
>> same
>> steps in reverse order.
>>
>> $  svn ps svn:mime-type application/octet-stream file
>> property 'svn:mime-type' set on 'file'
>>
>> $  svn ps svn:eol-style native file
>> svn: File 'file' has binary mime type property
>>
>> The described above is reproducible with subversion build from
>> 1.6.x
>> branch sources:
>>
>> $ svn --version
>> svn, version 1.6.13 (dev build)
> svn:eol-style and svn:mime-type application/octet-stream are pretty much 
> mutually exclusive. 
>
> Which is why it tells you not to set an eol-style on a binary file. 
>
> Are you saying you want it to not allow setting a file as binary if it has an 
> eol-style set?
>
> BOb
>


svn redo after reverse merge

2010-09-01 Thread ankush chadha

Hi All

I am trying to do following operation

file.txt has  100 revisions and located directly under svn://myrepo.org/trunk

1.  svn co svn://myrepo.org/trunk/

2. Undoing few changes made to  this file
svn merge -c -100 svn://myrepo.org/trunk/
svn  merge -c -99 svn://myrepo.org/trunk/
.
svn merge  -c -90 svn://myrepo.org/trunk/

3. After resolving all the  conflicts I do a commit (bulk)
svn commit -m "Rolling back rev  100 to 90"


4. Now suppose for some reason I want revision 95  back in, the following 
command won't work
svn merge -c 95  svn://myrepo.org/trunk/
as  according to SVN, revision 95 is already there

Whats the best  way to put a change back which was already there but rolled 
back 
due to  the reverse merge.

One way to do is to perform commit after every  single undo merge operation and 
rollback the reverse  merge to bring  the change back in. But I want to avoid 
this approach.


Ankush


  

Re: Reverse merge - Halted due to an unexpected erro

2010-09-01 Thread Lieven Govaerts
On Tue, Aug 31, 2010 at 12:43 PM, Bert Huijben  wrote:
>
>
>> -Original Message-
>> From: Stefan Sperling [mailto:s...@elego.de]
>> Sent: dinsdag 31 augustus 2010 12:22
>> To: Daniel Becroft
>> Cc: subversion
>> Subject: Re: Reverse merge - Halted due to an unexpected erro
>>
>> On Tue, Aug 31, 2010 at 12:54:00PM +1000, Daniel Becroft wrote:
>> > Hi all,
>> >
>> > I've just tried to reverse-merge a revision, and I've received the
>> following
>> > message:
>> >
>> > svn merge -c -9654 .../tools tools
>> >
>> >  BEGIN CONSOLE OUTPUT -
>> > This application has halted due to an unexpected error.
>> > A crash report and minidump file were saved to disk, you can find
>> them here:
>> > C:\Users\x\AppData\Local\Temp\14\svn-crash-log20100831124530.log
>> > C:\Users\x\AppData\Local\Temp\14\svn-crash-log20100831124530.dmp
>> > Please send the log file to users@subversion.apache.org to help us
>> analyse
>> > and solve this problem.
>> >
>> > NOTE: The crash report and minidump files can contain some sensitive
>> > information
>> > (filenames, partial file content, usernames and passwords etc.)
>> > - END CONSOLE OUTPUT -
>> >
>> > I can replicate this very easily with a fresh checkout, and it isn't
>> > revision specific (I've tried another revision and received the same
>> error).
>> >
>> >
>> > My environment is: Windows Server 2008 R2 (64-bit), svn 1.6.12
>> (SlikSVN) x64
>> >
>> > svn, version 1.6.12 (SlikSvn/1.6.12) X64
>> >    compiled Jun 22 2010, 21:00:12
>> >
>> > Copyright (C) 2000-2009 CollabNet.
>> > Subversion is open source software, see http://subversion.tigris.org/
>> > This product includes software developed by CollabNet (
>> > http://www.Collab.Net/).
>> >
>> > The following repository access (RA) modules are available:
>> >
>> > * ra_neon : Module for accessing a repository via WebDAV protocol
>> using
>> > Neon.
>> >   - handles 'http' scheme
>> >   - handles 'https' scheme
>> > * ra_svn : Module for accessing a repository using the svn network
>> protocol.
>> >   - with Cyrus SASL authentication
>> >   - handles 'svn' scheme
>> > * ra_local : Module for accessing a repository on local disk.
>> >   - handles 'file' scheme
>> > * ra_serf : Module for accessing a repository via WebDAV protocol
>> using
>> > serf.
>> >   - handles 'http' scheme
>> >   - handles 'https' scheme
>> >
>> > The strange thing is, everything works on my Windows XP Pro
>> workstation with
>> > 32-bit.
>>
>> I'm not a windows expert, but this looks like a problem with
>> 64bit/32bit
>> library mismatches. SlikSvn reports itself as 64bit, but the crashdump
>> shows that quite a few *32.dll files are loaded -- is that normal?
>
> The system32 directory on Windows contains the 64 bit files, so it loads the
> right files. (The 32 bit files are in the SYSWOW32 directory, which some 32
> bit applications might see as if it is SYSTEM32 directory if they have a
> compatibility shim).
>
> The dump file (.dmp) of this crash doesn't contain useful information. (The
> stack trace it contained is from after the actual crash). The .log file
> looks similar to one I recently noticed on another subversion mailing list

This one:
http://svn.haxx.se/users/archive-2010-08/0436.shtml

L.


Multiple Repositories under one subversion daemon

2010-09-01 Thread Tech Geek
I am running subversion server on a Windows machine. Right now I am in the
process of converting my exisiting projects to start using subversion and my
projects are located at different paths/locations. For example:
C:\data\project1
C:\project\bluecat
C:\software\abc

Now it seems that wehn we start svnserver executable it accepts the root
path of the repositories like this:

svnserve.exe --daemon --root drive:\path\to\repository\root

However in my case all my projects are under different locations and
unfortunately I cannot move them under one location because lot of other
systems are expecting those projects to be at that location. So I would
rather change the new system (svnserver) to adopt to the exisiting layout.

Is there any way to get around this?

Thanks.


RE: VisualSVN Server Error in Event Log

2010-09-01 Thread Bob Archer
> Hi,
> Can you help?  I started getting the following error message in my
> Windows Server 2003 Event log after making a change to the
> httpd.conf file (see attached):
> Event Type: Error
> Event Source:   VisualSVN Server 2.1
> Event Category: Apache
> Event ID:   1001
> Date:       8/29/2010
> Time:       8:25:45 AM
> User:       N/A
> Computer:   JDQSERVERPW
> Description:
> File does not exist: E:/Program Files/VisualSVN
> Server/htdocs/login_up.php3 [client 216.108.232.56] The error seems
> to occur each time a user access the SVN repository but users have
> not reported any problems.  I got concerned when our  VisualSVN
> Server Event Log overflowed.  The error reference to .. /VisualSVN
> Server/htdocs/login_up.php3 is odd. File "login_up.php3" definitely
> does not exist in the folder.  The question is "Why is it looking
> for it?"
> I understand that changing the httpd.conf file is not recommended
> as it will be overwritten during an upgrade, however, I was
> instructed to make the change by GeoTrust to support our SSL
> certificate for the URL that our SVN Server runs under.
> The only httpd.conf modification was to change:
> SSLCertificateFile  certs/server.pem SSLCertificateKeyFile
> certs/server.pem
> to:
> SSLCertificateFile  certs/cert.pem
> SSLCertificateKeyFile   certs/server.key The above was changed
> because I was unable to use the built-in VisualSVN Server Manager
> wizard for SSL certificates for a certificate that was already
> purchased and used for our MS IIS websites using the same URL.  As
> I understand it, a certificate issued for Microsoft IIS combines
> the certificate data and the Private Key data in one file.  The
> Apache httpd.conf is expecting two separate files - a Certificate
> file and a Private Key file. The GEOTRUST article describing how to
> do move a certificate from IIS to Apache is also attached for
> reference.
> We are using the latest VisualSVN Server Manager, Version: 2.1.3 on
> Windows Server 2003 (with the Apache virtual server for SVN) and
> Subversion 1.6.12 Server URL is
> https://www.jdqsystems.com:8443/svn/
> https://www.jdqsystems.com is the SSL certified domain that is used
> by both Subversion and other internal websites the server hosts.
> Thanks in advance.
> Jon

Is this a public server? I wonder if it is just the typical bots crawling for 
insecure apps and such. Although, I'm not sure why the VSVN server would be 
looking for the file.

Have you asked on the Visual SVN mail list?

BOb



RE: Multiple Repositories under one subversion daemon

2010-09-01 Thread Bob Archer
> I am running subversion server on a Windows machine. Right now I am
> in the process of converting my exisiting projects to start
> using subversion and my projects are located at different
> paths/locations. For example:
> C:\data\project1
> C:\project\bluecat
> C:\software\abc
> 
> Now it seems that wehn we start svnserver executable it accepts the
> root path of the repositories like this:
> 
> svnserve.exe --daemon --root drive:\path\to\repository\root
> 
> However in my case all my projects are under different locations
> and unfortunately I cannot move them under one location because lot
> of other systems are expecting those projects to be at that
> location. So I would rather change the new system (svnserver) to
> adopt to the exisiting layout.
> 
> Is there any way to get around this?

Have you tried symlinks? Windows 2008 server and up supports them.

BOb


RE: Multiple Repositories under one subversion daemon

2010-09-01 Thread Bob Archer
> > I am running subversion server on a Windows machine. Right now I
> am
> > in the process of converting my exisiting projects to start
> > using subversion and my projects are located at different
> > paths/locations. For example:
> > C:\data\project1
> > C:\project\bluecat
> > C:\software\abc
> >
> > Now it seems that wehn we start svnserver executable it accepts
> the
> > root path of the repositories like this:
> >
> > svnserve.exe --daemon --root drive:\path\to\repository\root
> >
> > However in my case all my projects are under different locations
> > and unfortunately I cannot move them under one location because
> lot
> > of other systems are expecting those projects to be at that
> > location. So I would rather change the new system (svnserver) to
> > adopt to the exisiting layout.
> >
> > Is there any way to get around this?
> 
> Have you tried symlinks? Windows 2008 server and up supports them.
> 
> BOb

I may have totally misunderstood you. Are the above paths you show working copy 
paths, or are they existing svn repositories?

BOb



Re: Multiple Repositories under one subversion daemon

2010-09-01 Thread Tech Geek
>I may have totally misunderstood you. Are the above paths you show working
copy paths, or are they existing svn repositories?
Those are not existing svn repositories yet. Let's just say that those
project folders should be at those locations only and I want to create SVN
repositories at each of those locations.

I am using a Windows XP Pro machine. Also by symlink do you mean Windows
shortcuts?


Re: Multiple Repositories under one subversion daemon

2010-09-01 Thread David Bartmess

 On 9/1/2010 4:46 PM, Tech Geek wrote:
>I may have totally misunderstood you. Are the above paths you show 
working copy paths, or are they existing svn repositories?
Those are not existing svn repositories yet. Let's just say that those 
project folders should be at those locations only and I want to create 
SVN repositories at each of those locations.
I am using a Windows XP Pro machine. Also by symlink do you mean 
Windows shortcuts?
From what you said, you need to create the repository and import from 
those locations into the repository. For that, you don't need to "put" 
the repository in those locations,  you just need to import from those 
locations, then do a clean checkout from the repository into those 
locations.



--
"Dingo" Dave Bartmess
Broomfield, CO. USA
http://edingo.net




Re: Multiple Repositories under one subversion daemon

2010-09-01 Thread Tech Geek
If I understand you correctly this would mean that somebody (user/developer)
has to checkout the code for each of the projects from the repository
location (say C:\svn\data\repositories) to:

C:\data\project1
C:\project\bluecat
C:\software\abc

so that the above locations reflect the latest code?


Re: is 'svn lock' possible for replication?

2010-09-01 Thread Steven Woody
On 23 August 2010 19:18, Daniel Shahaf  wrote:
> Campbell Allan wrote on Mon, Aug 23, 2010 at 11:10:28 +0100:
>>
>> On Sunday 22 Aug 2010, Andy Levy wrote:
>> > On Sun, Aug 22, 2010 at 14:16, Steven Woody  wrote:
>> > > On 20 August 2010 23:19, Steven Woody  wrote:
>> > >> Hi,
>> > >>
>> > >> With a replication/write-through setup, can a user execute 'svn lock'
>> > >> on master/slaver nodes? Thanks.
>> > >
>> > > Hey folks, no one can gives me a hint?
>> >
>> > You asked at the beginning of a weekend and no one is obligated to
>> > reply within a set timeframe (or at all, for that matter). If you need
>> > an answer that fast, it costs you nothing to set up a master/slave
>> > pair to test it for yourself (and you'd be done by now if you'd
>> > started Friday).
>>
>> I mentioned in your previous thread their isn't support in svnsync and this
>> would require a third party script to maintain the locks.
>
> Yeah, either the pre-lock hook on the mirror could run 'lock' on the
> master manually, or someone could go ahead and patch mod_dav_svn to do
> that directly in the C code.
>
> I'm pretty sure I saw/heard of such a pre-lock hook somewhere...
>
> Daniel
>


Thank you everyone.  Maybe I really need to do some tests.  I think
there is no problem to setup multiple instances of subversion.  I did
not do experiment before is because that server is really serious one.

-- 
Life is the only flaw in an otherwise perfect nonexistence
    -- Schopenhauer

narke
public key at http://subkeys.pgp.net:11371 (narkewo...@gmail.com)


RE: svn redo after reverse merge

2010-09-01 Thread Cooke, Mark
> -Original Message-
> From: ankush chadha [mailto:ankushchadha2...@yahoo.com] 
> Sent: 01 September 2010 17:16
> To: users@subversion.apache.org
> Subject: svn redo after reverse merge
> 
> Hi All
> 
> I am trying to do following operation
> 
> file.txt has 100 revisions and located directly under 
> svn://myrepo.org/trunk
> 
> 1. svn co svn://myrepo.org/trunk/
> 
> 2. Undoing few changes made to this file
> svn merge -c -100 svn://myrepo.org/trunk/
> svn merge -c -99 svn://myrepo.org/trunk/
> .
> svn merge -c -90 svn://myrepo.org/trunk/
> 
> 3. After resolving all the conflicts I do a commit (bulk)
> svn commit -m "Rolling back rev 100 to 90"
> 
If you just want to go back to the file as it was in r90, why not just
get a copy of that revision and check it in again with a suitable
comment?  Seems a lot less hassle to me (but maybe I am missing
something)...

> 4. Now suppose for some reason I want revision 95 back in, 
> the following command won't work
> svn merge -c 95 svn://myrepo.org/trunk/
> as according to SVN, revision 95 is already there
> 
I'm not sure what you want to do here?  Are you wanting to apply the {
r94 > r95 } patch to what is in effect r90?  Or just revert to r95 (in
which case you could just get r95 and check it in again)?

> Whats the best way to put a change back which was already 
> there but rolled back due to the reverse merge.
> 
> One way to do is to perform commit after every single undo 
> merge operation and rollback the reverse  merge to bring the 
> change back in. But I want to avoid this approach.
> 
Can you clarify?  It seems a slightly odd thing to be doing.

~ mark c


RE: Multiple Repositories under one subversion daemon

2010-09-01 Thread Cooke, Mark
Note: If you edit the flow too much, the question loses it's context and
can be quite difficult to follow...

> -Original Message-
> From: Tech Geek [mailto:techgeek12...@gmail.com] 
> Sent: 01 September 2010 21:02
> To: Subversion Users
> Subject: Multiple Repositories under one subversion daemon
> 
> I am running subversion server on a Windows machine. Right 
> now I am in the process of converting my exisiting projects 
> to start using subversion and my projects are located at 
> different paths/locations. For example:
> C:\data\project1
> C:\project\bluecat
> C:\software\abc
>  
> Now it seems that wehn we start svnserver executable it 
> accepts the root path of the repositories like this:
>  
> svnserve.exe --daemon --root drive:\path\to\repository\root
>  
> However in my case all my projects are under different 
> locations and unfortunately I cannot move them under one 
> location because lot of other systems are expecting those 
> projects to be at that location. So I would rather change the 
> new system (svnserver) to adopt to the exisiting layout.
>  
> Is there any way to get around this?
>  



> -Original Message-
> From: Tech Geek [mailto:techgeek12...@gmail.com] 
> Sent: 02 September 2010 00:40
> To: David Bartmess
> Cc: users@subversion.apache.org
> Subject: Re: Multiple Repositories under one subversion daemon
> 
> If I understand you correctly this would mean that somebody 
> (user/developer) has to checkout the code for each of the 
> projects from the repository location (say 
> C:\svn\data\repositories) to:
>  
> C:\data\project1
> C:\project\bluecat
> C:\software\abc
>  
> so that the above locations reflect the latest code?
> 
A subversion repository cannot be used directly for tasks such as
building the project, it is a safe location for storing all the history
of the project files.  You then 'check out' a "working copy" of the
project (from the latest or any historical point in time) to pretty much
anywhere you fancy and do your work there.  Most subversion repositories
are on centrally managed (and backed-up) servers remote from the actual
development / deployment work because you want to safeguard your
precious source code...

So, yes, the subversion repository must be somewhere other than your
current "working copies" and some task (developer or automated) would be
responsible for keeping these projects up to date.  To assist in this,
subversion provides "hooks" that can and are used for just such tasks.

Have you read the free online subversion book?  The first few chapters
are a great introduction to source code control:

http://svnbook.red-bean.com/nightly/en/index.html

I hope that helps,

~ mark c