Problems with setting up subversion

2011-03-23 Thread Cecil Westerhof
I have set up a repository for a client.

When giving:
svn list svn://localhost

I get nothing. As expected, because the repository is empty.

But when I try:
svn mkdir svn://localhost/test -m ''

I get:
svn: Authorization failed

On my own system I can do this without a problem.

On my system subversion runs as:
svn   2696 1 Mar22 ?00:00:00 Ss   /usr/bin/svnserve -d -r 
/srv/svn/repos
On the client system:
svn  25242 1 Mar22 ?00:00:00 Ss   /usr/bin/svnserve -d 
--pid-file /tmp/svnserve.pid -r /srv/svn/repos

The /srv/svn/repos on my system:
drwxr-xr-x 2 svn svn 4,0K 16 mrt 11:23 conf
drwxr-sr-x 6 svn svn 4,0K 23 mrt 10:00 db
-r--r--r-- 1 svn svn2 18 jan 23:30 format
drwxr-xr-x 2 svn svn 4,0K 18 jan 23:30 hooks
drwxr-xr-x 2 svn svn 4,0K 18 jan 23:30 locks
-rw-r--r-- 1 svn svn  229 18 jan 23:30 README.txt
on the client system:
drwxr-xr-x 2 svn cecil 4.0K 2011-03-22 14:56 conf
drwxr-sr-x 6 svn cecil 4.0K 2011-03-22 14:56 db
-r--r--r-- 1 svn cecil2 2011-03-22 14:56 format
drwxr-xr-x 2 svn cecil 4.0K 2011-03-22 14:56 hooks
drwxr-xr-x 2 svn cecil 4.0K 2011-03-22 14:56 locks
-rw-r--r-- 1 svn cecil  229 2011-03-22 14:56 README.txt

The group is different, but that should not make a difference I would
think. What could be happening here?

My version:
svnserve, version 1.6.15 (r1038135)
the clients version:
svnserve, version 1.6.12 (r955767)

-- 
Cecil Westerhof
Senior Software Engineer
LinkedIn: http://www.linkedin.com/in/cecilwesterhof


Re: Problems with setting up subversion

2011-03-23 Thread Ulrich Eckhardt
On Wednesday 23 March 2011, Cecil Westerhof wrote:
> I have set up a repository for a client.
>
> When giving:
> svn list svn://localhost
>
> I get nothing. As expected, because the repository is empty.
>
> But when I try:
> svn mkdir svn://localhost/test -m ''
>
> I get:
> svn: Authorization failed
>
> On my own system I can do this without a problem.

Check the authentication/authorization setup in the repository's 
configuration.

Uli

-- 
ML: http://subversion.apache.org/docs/community-guide/mailing-lists.html
FAQ: http://subversion.apache.org/faq.html
Docs: http://svnbook.red-bean.com/

**
Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**
Visit our website at http://www.dominolaser.com
**
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. Domino Laser GmbH ist für diese Folgen nicht 
verantwortlich.
**



Re: Problems with setting up subversion

2011-03-23 Thread Cecil Westerhof
Op woensdag 23 mrt 2011 11:20 CET schreef Ulrich Eckhardt:

>> I have set up a repository for a client.
>>
>> When giving:
>> svn list svn://localhost
>>
>> I get nothing. As expected, because the repository is empty.
>>
>> But when I try:
>> svn mkdir svn://localhost/test -m ''
>>
>> I get:
>> svn: Authorization failed
>>
>> On my own system I can do this without a problem.
>
> Check the authentication/authorization setup in the repository's 
> configuration.

Of-course, I forgot. In my version I put:
anon-access = write

(Is not a problem because it is only used locally.)

Well I have to wait until I get the credentials to edit the conf
files.

I'll start implementing SASL on my own system. When I get the
credentials I know what to do.

-- 
Cecil Westerhof
Senior Software Engineer
LinkedIn: http://www.linkedin.com/in/cecilwesterhof


Setting the caching of passwords only localy

2011-03-23 Thread Cecil Westerhof
As I understand it the caching or not is done through setting:
${HOME}/.subversion/servers

Is it possible to do this centrally?

-- 
Cecil Westerhof
Senior Software Engineer
LinkedIn: http://www.linkedin.com/in/cecilwesterhof


Re: Setting the caching of passwords only localy

2011-03-23 Thread Nico Kadel-Garcia
On Wed, Mar 23, 2011 at 9:47 AM, Cecil Westerhof  wrote:
> As I understand it the caching or not is done through setting:
>    ${HOME}/.subversion/servers
>
> Is it possible to do this centrally?

Your question is a bit unclear. The client needs cached keys, or
passwords, in order to do anything that requires network authorization
on the upstream Subversion server. The Windows clients, such as
TortoiseSVN, have their own encrypted key storage setup. The UNIX and
Linux clients will store HTTP/HTTPS passwords in
$HOME/.subversion/servers, by default, and store them in clear text.

It's possible to use access techniques that do not do this, such as
SSL keys or SSH keys for svn+ssh. That requires the client to have a
private, ideally passphrase protected, and the public keys to be
stored and managed on the server. This is coverd in the Subversion
"red book", though the actual management of the keys is not well
addressed.

Would that cover your needs?


Re: Setting the caching of passwords only localy

2011-03-23 Thread Cecil Westerhof
Op woensdag 23 mrt 2011 15:02 CET schreef Nico Kadel-Garcia:

>> As I understand it the caching or not is done through setting:
>>    ${HOME}/.subversion/servers
>>
>> Is it possible to do this centrally?
>
> Your question is a bit unclear. The client needs cached keys, or
> passwords, in order to do anything that requires network authorization
> on the upstream Subversion server. The Windows clients, such as
> TortoiseSVN, have their own encrypted key storage setup. The UNIX and
> Linux clients will store HTTP/HTTPS passwords in
> $HOME/.subversion/servers, by default, and store them in clear text.

That is where the configuration is. In my case it was saved in:
~/.subversion/auth/svn.simple/a350574f4c355826cf779d6c707aa69f


> It's possible to use access techniques that do not do this, such as
> SSL keys or SSH keys for svn+ssh. That requires the client to have a
> private, ideally passphrase protected, and the public keys to be
> stored and managed on the server. This is coverd in the Subversion
> "red book", though the actual management of the keys is not well
> addressed.
>
> Would that cover your needs?

Not really. I would like that it is `impossible' that passwords are
stored in clear text. Now every user can decide for itself. Because
the situation properly will be that the people will do a commit in the
evening and a update in the morning, it would not be a big problem
that they have to input there password every-time.

But maybe I am going to far. Seeing that now everything is done by
(unencrypted) FTP, it would be a big improvement when they would use
subversion with SASL. So lets first implement this. Later on I could
make things even more secure.

-- 
Cecil Westerhof
Senior Software Engineer
LinkedIn: http://www.linkedin.com/in/cecilwesterhof


Re: Setting the caching of passwords only localy

2011-03-23 Thread Stefan Sperling
On Wed, Mar 23, 2011 at 02:47:46PM +0100, Cecil Westerhof wrote:
> As I understand it the caching or not is done through setting:
> ${HOME}/.subversion/servers
> 
> Is it possible to do this centrally?

Put this in /etc/subversion/servers:

[global]
store-plaintext-passwords=no


Tests fail on windows when building using --with-libintl

2011-03-23 Thread Glen Cooper
Hello,

When building subversion with the --with-libintl option, I have a number of
tests that don't pass in the test suite.  If I remove the --with-libintl
option and rebuild, all tests pass.  I am using the svn-win32libintl package
downloaded from tigris.

Here's my call to gen-make.py.  This won't pass all tests.  If I omit
"--with-libint" and "--enable-nls" then all tests pass.

gen-make.py -t vcproj
--with-httpd=..\httpd-2.2.16
--with-berkeley-db=db4-win32
--with-openssl=..\openssl-0.9.8r
--with-neon=..\neon-0.29.5
--with-serf=..\serf-0.7.0
--with-zlib=..\zlib-1.2.4
--with-sqlite=..\sqlite-3.7.5
--with-sasl=..\sasl
--with-libintl=..\svn-win32-libintl
--vsnet-version=2008
--enable-nls

I am building on a Windows 2008 x64 Server with Visual Studio 2008.

Here's an example of the type of test failure I see - it's mostly missing
properties.

=
Expected 'B_COPY' and actual 'B_COPY' in disk tree are different!
=
EXPECTED NODE TO BE:
=
 * Node name: B_COPY
Path: __SVN_ROOT_NODE\A\B_COPY
Contents: N/A (node is a directory)
Properties: {'svn:mergeinfo': '/A/B:3-5'}
Attributes: {}
Children: 3
=
ACTUAL NODE FOUND:
=
 * Node name: B_COPY
Path: __SVN_ROOT_NODE\A\B_COPY
Contents: N/A (node is a directory)
Properties: {}
Attributes: {}
Children: 3

-- 
Glen Cooper
(425) 522-3013


Re: Setting the caching of passwords only localy

2011-03-23 Thread Nico Kadel-Garcia
On Wed, Mar 23, 2011 at 11:04 AM, Stefan Sperling  wrote:
> On Wed, Mar 23, 2011 at 02:47:46PM +0100, Cecil Westerhof wrote:
>> As I understand it the caching or not is done through setting:
>>     ${HOME}/.subversion/servers
>>
>> Is it possible to do this centrally?
>
> Put this in /etc/subversion/servers:
>
> [global]
> store-plaintext-passwords=no

I'm looking for documentation on this. I don't see it *anywhere*,
except a few comments in the source code for
libsvn_subr/config_file.c, not in the manual pages nor in the
"redbook".

Moreover, this only works on a single client host basis, it won't work
if the subversion is installed locally with a distinct "./configure
--sysconfdir=/etc" setting, it can be overridden in the individual
user's $HOME/.subversionn/servers file, etc., etc.

It's not a reliable approach. If you want to be sure of clients not
storing passwords with Subversion, you pretty much can't use password
based access techniques.


Locking a file in a moved folder

2011-03-23 Thread Arjen Wisse
Hi,

Let's have the following folder/file structure:
 * f1
 ** test.txt

(so the file 'test.txt' is part of folder 'f1').

After renaming 'f1' to 'f2' (using svn rename) I get the following
error when executing:

>svn lock f2/test.txt
svn: Path '/f2/test.txt' doesn't exist in HEAD revision

Of course, it does not exist in the HEAD revision at that location,
because the folder is renamed. So, IMO it should lock the file
'test.txt' in path '/f1/test.txt' in the repository as I did not
commit my rename yet. How can I ensure locking in this case?

Regards,
Arjen Wisse


SVN always thinks a few certain files need to be merged

2011-03-23 Thread Steve Cohen
Somewhere back in the distant past, I was a bad bad boy and did 
something that SVN didn't like to get some merge to work.  This happened 
about two years ago.


Since then, these files are picked up for properties merges whenever I 
merge their project even though they haven't really changed in years. 
How can I FIX this merge info so I stop being bothered by them.


This is really annoying.


Re: SVN always thinks a few certain files need to be merged

2011-03-23 Thread Nico Kadel-Garcia
On Wed, Mar 23, 2011 at 5:37 PM, Steve Cohen  wrote:
> Somewhere back in the distant past, I was a bad bad boy and did something
> that SVN didn't like to get some merge to work.  This happened about two
> years ago.
>
> Since then, these files are picked up for properties merges whenever I merge
> their project even though they haven't really changed in years. How can I
> FIX this merge info so I stop being bothered by them.
>
> This is really annoying.

Wouldn't "svn revert filename" clear this? Or did you want to keep your changes?


Re: SVN always thinks a few certain files need to be merged

2011-03-23 Thread Pat Farrell
>> Since then, these files are picked up for properties merges whenever I merge
>> their project even though they haven't really changed in years. How can I
>> FIX this merge info so I stop being bothered by them.
> 
> Wouldn't "svn revert filename" clear this? Or did you want to keep your 
> changes?

Nope. I've had the same problem for at least a year. I think it was
caused by a bug in the implementation of "merge info" back in 1.5 days.

For me, the file in question has not been modified in at least a year.
Yet every time I do anything to other files, it is marked as updated.

I have no idea how to fix it, but I sure would want to find a solution.

-- 
Pat Farrell
http://www.pfarrell.com/



Re: Tests fail on windows when building using --with-libintl

2011-03-23 Thread Glen Cooper
Actually it turns out that if I omit --enable-nls but keep
--with-libintl=..\svn-win32-libintl
all the tests pass.

Is --enable-nls required for something?  Based on the documentation I
thought --enable-nls was somehow linked to --with-libintl.  What do I lose
if I don't pass the --enable-nls argument?

Thanks,
Glen

On Wed, Mar 23, 2011 at 8:44 AM, Glen Cooper  wrote:

> Hello,
>
> When building subversion with the --with-libintl option, I have a number of
> tests that don't pass in the test suite.  If I remove the --with-libintl
> option and rebuild, all tests pass.  I am using the svn-win32libintl package
> downloaded from tigris.
>
> Here's my call to gen-make.py.  This won't pass all tests.  If I omit
> "--with-libint" and "--enable-nls" then all tests pass.
>
> gen-make.py -t vcproj
> --with-httpd=..\httpd-2.2.16
> --with-berkeley-db=db4-win32
> --with-openssl=..\openssl-0.9.8r
> --with-neon=..\neon-0.29.5
> --with-serf=..\serf-0.7.0
> --with-zlib=..\zlib-1.2.4
> --with-sqlite=..\sqlite-3.7.5
> --with-sasl=..\sasl
> --with-libintl=..\svn-win32-libintl
> --vsnet-version=2008
> --enable-nls
>
> I am building on a Windows 2008 x64 Server with Visual Studio 2008.
>
> Here's an example of the type of test failure I see - it's mostly missing
> properties.
>
> =
> Expected 'B_COPY' and actual 'B_COPY' in disk tree are different!
> =
> EXPECTED NODE TO BE:
> =
>  * Node name: B_COPY
> Path: __SVN_ROOT_NODE\A\B_COPY
> Contents: N/A (node is a directory)
> Properties: {'svn:mergeinfo': '/A/B:3-5'}
> Attributes: {}
> Children: 3
> =
> ACTUAL NODE FOUND:
> =
>  * Node name: B_COPY
> Path: __SVN_ROOT_NODE\A\B_COPY
> Contents: N/A (node is a directory)
> Properties: {}
> Attributes: {}
> Children: 3
>
> --
> Glen Cooper
> (425) 522-3013
>



-- 
Glen Cooper
(425) 522-3013


Re: Tests fail on windows when building using --with-libintl

2011-03-23 Thread Mark Phippard
Both features only enable the error messages and help to appear in non-English 
languages.

Sent from my iPhone

On Mar 23, 2011, at 6:44 PM, Glen Cooper  wrote:

> Actually it turns out that if I omit --enable-nls but keep 
> --with-libintl=..\svn-win32-libintl all the tests pass.
> 
> Is --enable-nls required for something?  Based on the documentation I thought 
> --enable-nls was somehow linked to --with-libintl.  What do I lose if I don't 
> pass the --enable-nls argument?
> 
> Thanks,
> Glen
> 
> On Wed, Mar 23, 2011 at 8:44 AM, Glen Cooper  wrote:
> Hello,
> 
> When building subversion with the --with-libintl option, I have a number of 
> tests that don't pass in the test suite.  If I remove the --with-libintl 
> option and rebuild, all tests pass.  I am using the svn-win32libintl package 
> downloaded from tigris.
> 
> Here's my call to gen-make.py.  This won't pass all tests.  If I omit 
> "--with-libint" and "--enable-nls" then all tests pass.
> 
> gen-make.py -t vcproj 
> --with-httpd=..\httpd-2.2.16 
> --with-berkeley-db=db4-win32 
> --with-openssl=..\openssl-0.9.8r 
> --with-neon=..\neon-0.29.5 
> --with-serf=..\serf-0.7.0 
> --with-zlib=..\zlib-1.2.4 
> --with-sqlite=..\sqlite-3.7.5 
> --with-sasl=..\sasl 
> --with-libintl=..\svn-win32-libintl 
> --vsnet-version=2008 
> --enable-nls
> 
> I am building on a Windows 2008 x64 Server with Visual Studio 2008.
> 
> Here's an example of the type of test failure I see - it's mostly missing 
> properties.
> 
> = 
> Expected 'B_COPY' and actual 'B_COPY' in disk tree are different! 
> = 
> EXPECTED NODE TO BE: 
> = 
>  * Node name: B_COPY 
> Path: __SVN_ROOT_NODE\A\B_COPY 
> Contents: N/A (node is a directory) 
> Properties: {'svn:mergeinfo': '/A/B:3-5'} 
> Attributes: {} 
> Children: 3 
> = 
> ACTUAL NODE FOUND: 
> = 
>  * Node name: B_COPY 
> Path: __SVN_ROOT_NODE\A\B_COPY 
> Contents: N/A (node is a directory) 
> Properties: {} 
> Attributes: {} 
> Children: 3
> 
> -- 
> Glen Cooper
> (425) 522-3013
> 
> 
> 
> -- 
> Glen Cooper
> (425) 522-3013


Re: SVN always thinks a few certain files need to be merged

2011-03-23 Thread Steve Cohen

On 03/23/2011 05:36 PM, Pat Farrell wrote:

Since then, these files are picked up for properties merges whenever I merge
their project even though they haven't really changed in years. How can I
FIX this merge info so I stop being bothered by them.


Wouldn't "svn revert filename" clear this? Or did you want to keep your changes?


Nope. I've had the same problem for at least a year. I think it was
caused by a bug in the implementation of "merge info" back in 1.5 days.

For me, the file in question has not been modified in at least a year.
Yet every time I do anything to other files, it is marked as updated.

I have no idea how to fix it, but I sure would want to find a solution.


Exactly.

The files haven't changed in two years.  Yet every time I do a merge I 
encounter them.  And all it's about is "merge info".  Isn't there some 
way to get the "merge info" right?  There MUST BE.





Re: SVN always thinks a few certain files need to be merged

2011-03-23 Thread Konstantin Kolinko
2011/3/24 Steve Cohen :
>
> The files haven't changed in two years.  Yet every time I do a merge I
> encounter them.  And all it's about is "merge info".  Isn't there some way
> to get the "merge info" right?  There MUST BE.
>

Maybe  "svn merge --record-only" on the root of the project with that
revision that is mentioned in your file's svn:merge-info property. You
are not giving much specifics, so how can people know what is going on
in your case?


Re: SVN always thinks a few certain files need to be merged

2011-03-23 Thread Pat Farrell
On 03/23/2011 08:34 PM, Konstantin Kolinko wrote:
>  You  are not giving much specifics, so how can people know what is going on
> in your case?

Specifics for complete 100% reproducable problem:

do svn update for whole project
create branch from trunk
change one source file, not the one with the bogus mergeinfo, commit it.
merge branch back to trunk

before you commit the trunk, do a svn status
You will see the bogus mergeinfo listed as a change to the trunk.

for example:

 svn merge https://www.everythingtiny.com/repos/bbook/branches/pat -r
14135:14147
--- Merging r14146 through r14147 into '.':
Ufnflib/src/com/fnfbook/daemon/helpers/MailToBlog.java
pfarrell@tools:~/sandbox/bbook/trunk$ svn status
 M  .
M   fnflib/src/com/fnfbook/daemon/helpers/MailToBlog.java
 M  fnfapp/src/java/com/fnfbook/bean/FilterListBase.java

The "FilterListBase" is marked as modified, but it has not been changed
in a year and was not changed in this
edit, only the "MailToBlog.java" file was modified.


-- 
Pat Farrell
http://www.pfarrell.com/



Re: SVN always thinks a few certain files need to be merged

2011-03-23 Thread David Huang

On Mar 23, 2011, at 7:52 PM, Pat Farrell wrote:

> On 03/23/2011 08:34 PM, Konstantin Kolinko wrote:
>> You  are not giving much specifics, so how can people know what is going on
>> in your case?
> 
> Specifics for complete 100% reproducable problem:
> 
> do svn update for whole project
> create branch from trunk
> change one source file, not the one with the bogus mergeinfo, commit it.
> merge branch back to trunk
> 
> before you commit the trunk, do a svn status
> You will see the bogus mergeinfo listed as a change to the trunk.


If you're sure that the mergeinfo is bogus, why not just delete it?
e.g., svn propdel svn:mergeinfo 
fnfapp/src/java/com/fnfbook/bean/FilterListBase.java

http://www.collab.net/community/subversion/articles/merge-info.html might be 
worth a read too.

-- 
Name: Dave Huang |  Mammal, mammal / their names are called /
INet: k...@azeotrope.org |  they raise a paw / the bat, the cat /
FurryMUCK: Dahan |  dolphin and dog / koala bear and hog -- TMBG
Dahan: Hani G Y+C 35 Y++ L+++ W- C++ T++ A+ E+ S++ V++ F- Q+++ P+ B+ PA+ PL++



Re: SVN always thinks a few certain files need to be merged

2011-03-23 Thread Pat Farrell
On 03/23/2011 09:02 PM, David Huang wrote:
> If you're sure that the mergeinfo is bogus, why not just delete it?
> e.g., svn propdel svn:mergeinfo 
> fnfapp/src/java/com/fnfbook/bean/FilterListBase.java

I'm sure. I'll try that.
 I have not tried it before, because I can't figure out what in the heck
mergeinfo was supposed to do, and there have been lots of comments that
it really didn't work properly in 1.5, and that it works differently in
1.6, etc.

in other words, I didn't know to do that.

Or even that such as command existed.

For me, blowing up all mergeinfo would improve SVN.

propset/propedit/propdel is opaque to me, everytime I try to use it, I
spend an hour dorking around trying random combination of specs,
directories, etc.

-- 
Pat Farrell
http://www.pfarrell.com/



baffled by how merging works

2011-03-23 Thread Michael Remijan
I'm fairly new to svn and I'm trying to get my head around how svn handles 
branches and merging.  I've done a lot of reading on this, I've been able to 
work my way through merging changes from TRUNK to a BRANCH but I still do not 
quite understand it.  If someone could start by explaining what happens in this 
scenario that would help.

First, I used this command to see the differences between my BRANCH and TRUNK
  svn diff --summarize --old http://repo/proj/branches/1/  --new 
http://repo/proj/trunk/

Second, based on the summary, I merged differences from TRUNK into BRANCH and 
commited the BRANCH.

Third, I re-ran the command to see if there were any changes I missed.
  svn diff --summarize --old http://repo/proj/branches/1/  --new 
http://repo/proj/trunk/

To my surprise it gave me the same summary.  After merging the changes into the 
BRANCH and committing the changes, I expected there to be no changes.  So why 
does it give me the same summary?

Re: SVN always thinks a few certain files need to be merged

2011-03-23 Thread Konstantin Kolinko
2011/3/24 David Huang :
>
> On Mar 23, 2011, at 7:52 PM, Pat Farrell wrote:
>
>> On 03/23/2011 08:34 PM, Konstantin Kolinko wrote:
>>> You  are not giving much specifics, so how can people know what is going on
>>> in your case?
>>
>> Specifics for complete 100% reproducable problem:
>>
>> do svn update for whole project
>> create branch from trunk
>> change one source file, not the one with the bogus mergeinfo, commit it.
>> merge branch back to trunk
>>
>> before you commit the trunk, do a svn status
>> You will see the bogus mergeinfo listed as a change to the trunk.
>
>
> If you're sure that the mergeinfo is bogus, why not just delete it?
> e.g., svn propdel svn:mergeinfo 
> fnfapp/src/java/com/fnfbook/bean/FilterListBase.java
>

> http://www.collab.net/community/subversion/articles/merge-info.html
> might be worth a read too.

+1

Also this article, "Where Did That Mergeinfo Come From?"
http://blogs.collab.net/subversion/2009/11/where-did-that-mergeinfo-come-from/

Best regards,
Konstantin Kolinko


Re: baffled by how merging works

2011-03-23 Thread Daniel Becroft
On Thu, Mar 24, 2011 at 12:03 PM, Michael Remijan wrote:

> I'm fairly new to svn and I'm trying to get my head around how svn handles
> branches and merging.  I've done a lot of reading on this, I've been able to
> work my way through merging changes from TRUNK to a BRANCH but I still do
> not quite understand it.  If someone could start by explaining what happens
> in this scenario that would help.
>
> First, I used this command to see the differences between my BRANCH and
> TRUNK
>   svn diff --summarize --old http://repo/proj/branches/1/  --new
> http://repo/proj/trunk/
>
> Second, based on the summary, I merged differences from TRUNK into BRANCH
> and commited the BRANCH.
>
> Third, I re-ran the command to see if there were any changes I missed.
>   svn diff --summarize --old http://repo/proj/branches/1/  --new
> http://repo/proj/trunk/
>
> To my surprise it gave me the same summary.  After merging the changes into
> the BRANCH and committing the changes, I expected there to be no changes.
> So why does it give me the same summary?
>

I think your --old and --new switches are around the wrong way.

'svn diff --summarize --old  --new '  will give you the
changes on the branch not on trunk,
'svn diff --summarize --old  --new ' will give you the
changes on trunk not yet on the branch.

It seems you want the latter.

Cheers,
Daniel B.


Re: Tests fail on windows when building using --with-libintl

2011-03-23 Thread Glen Cooper
Thanks Mark,

Any idea why including them would cause certain tests to fail?

I'm not sure how significant this is, but I get these messages during my
build:

msgfmt.exe: de.spo: warning: Charset missing in header.
 Message conversion to user's charset will not
work.
msgfmt.exe: de.spo: headerfield `Content-Type' missing in header

Glen

On Wed, Mar 23, 2011 at 4:13 PM, Mark Phippard  wrote:

> Both features only enable the error messages and help to appear in
> non-English languages.
>
> Sent from my iPhone
>
> On Mar 23, 2011, at 6:44 PM, Glen Cooper  wrote:
>
> Actually it turns out that if I omit --enable-nls but
> keep --with-libintl=..\svn-win32-libintl all the tests pass.
>
> Is --enable-nls required for something?  Based on the documentation I
> thought --enable-nls was somehow linked to --with-libintl.  What do I lose
> if I don't pass the --enable-nls argument?
>
> Thanks,
> Glen
>
> On Wed, Mar 23, 2011 at 8:44 AM, Glen Cooper < 
> g...@glenc.net> wrote:
>
>> Hello,
>>
>> When building subversion with the --with-libintl option, I have a number
>> of tests that don't pass in the test suite.  If I remove the --with-libintl
>> option and rebuild, all tests pass.  I am using the svn-win32libintl package
>> downloaded from tigris.
>>
>> Here's my call to gen-make.py.  This won't pass all tests.  If I omit
>> "--with-libint" and "--enable-nls" then all tests pass.
>>
>> gen-make.py -t vcproj
>> --with-httpd=..\httpd-2.2.16
>> --with-berkeley-db=db4-win32
>> --with-openssl=..\openssl-0.9.8r
>> --with-neon=..\neon-0.29.5
>> --with-serf=..\serf-0.7.0
>> --with-zlib=..\zlib-1.2.4
>> --with-sqlite=..\sqlite-3.7.5
>> --with-sasl=..\sasl
>> --with-libintl=..\svn-win32-libintl
>> --vsnet-version=2008
>> --enable-nls
>>
>> I am building on a Windows 2008 x64 Server with Visual Studio 2008.
>>
>> Here's an example of the type of test failure I see - it's mostly missing
>> properties.
>>
>> =
>> Expected 'B_COPY' and actual 'B_COPY' in disk tree are different!
>> =
>> EXPECTED NODE TO BE:
>> =
>>  * Node name: B_COPY
>> Path: __SVN_ROOT_NODE\A\B_COPY
>> Contents: N/A (node is a directory)
>> Properties: {'svn:mergeinfo': '/A/B:3-5'}
>> Attributes: {}
>> Children: 3
>> =
>> ACTUAL NODE FOUND:
>> =
>>  * Node name: B_COPY
>> Path: __SVN_ROOT_NODE\A\B_COPY
>> Contents: N/A (node is a directory)
>> Properties: {}
>> Attributes: {}
>> Children: 3
>>
>> --
>> Glen Cooper
>> (425) 522-3013
>>
>
>
>
> --
> Glen Cooper
> (425) 522-3013
>
>


-- 
Glen Cooper
(425) 522-3013


SVN is causing errors.

2011-03-23 Thread chudapati09

I'm new to the whole SVN thing, it's pretty sweet so I thought I might try it
out on my home computer. 

I have:
Windows 7 Ultimate x32

I installed the following programs:
Apache 2.0.64
Subversion 1.5.1
TortoiseSVN 1.6.14.21012

I added the following lines to Program Files\Apache
Group\Apache2\conf\httpd.conf
LoadModule dav_module modules/mod_dav.so
LoadModule dav_fs_module modules/mod_dav_fs.so
LoadModule dav_svn_module modules/mod_dav_svn.so
LoadModule authz_svn_module modules/mod_authz_svn.so

I added the following code to the end of Program Files\Apache
Group\Apache2\conf\httpd.conf

DAV svn
SVNPath "C:\svn"
AuthType Basic
AuthName "Subversion repository"
AuthUserFile "c:\svn_conf\passwd"
Require valid-user


My repository is located in C:\svn
My passwd is located in C:\svn_conf

I am able to import a Project into my repository, and also check it out
also.
But when I try to access http://localhost/svn/ I get the following message 


Could not open the requested SVN
filesystem


The apache error.log produces:
[Wed Mar 23 23:51:43 2011] [error] [client 192.168.1.1] Could not open the
requested SVN filesystem  [500, #160043]

The apache access.log produces:
192.168.1.1 - name [23/Mar/2011:23:51:43 -0500] "GET /svn HTTP/1.1" 500 239 

My goal is to be able to access my SVN Repository for anywhere. I created a
no-ip dns host, and when I try to check out my project

URL of Repository:
http://(my url)/svn

I'm get my authentication window, and my username and password work, but I
get the following error:
Could not open the requested SVN filesystem

I'm guessing that the error I got before, is involved with this.
-- 
View this message in context: 
http://old.nabble.com/SVN-is-causing-errors.-tp31226203p31226203.html
Sent from the Subversion Users mailing list archive at Nabble.com.