duplicate merge conflict

2011-04-13 Thread Daniel Walter
When I merge changes in SVN, the merges work well except for the conflicts. For some reason, the merges are frequently (but not always done twice). As an example: <<< .working <<< .working const int SERIALIZE_FIELDS_DATA_LENGTH = 83; === const int SERIALIZE_FIELDS_DATA_LENGTH = 91;

Re: Updating the WC from an non svn directory

2011-04-13 Thread Ryan Schmidt
On Apr 14, 2011, at 01:12, Peter@locotel wrote: > Dear Ryan, > thank u ever so much for your educated answer. I have to go through the > material you > sent me and apply to our development team. We have been using a backup like > procedure till today which has become unmanageable, as projects g

Re: Updating the WC from an non svn directory

2011-04-13 Thread Peter@locotel
Dear Ryan, thank u ever so much for your educated answer. I have to go through the material you sent me and apply to our development team. We have been using a backup like procedure till today which has become unmanageable, as projects grow. I hope that subversion will provide a traceable method

Re: Building issue.

2011-04-13 Thread Daniel Shahaf
On Thu, 14 Apr 2011 14:49 +1000, "Gavin Beau Baumanis" wrote: > Hi Everyone, > I am trying to build SVN from source code on my Mac (OS X 10.6.6) > > I have checked out the code from trunk and have all the dependencies > available too; > > Following INSTALL; > sh ./autogen.sh > ./configure > mak

Building issue.

2011-04-13 Thread Beau
Hi Everyone, I am trying to build SVN from source code on my Mac (OS X 10.6.6) I have checked out the code from trunk and have all the dependencies available too; Following INSTALL; sh ./autogen.sh ./configure make make install however when I run make install I get the following error; svn: E1

Re: Finding the revision of a deleted file.

2011-04-13 Thread Gavin "Beau" Baumanis
Hi Stefan / Konstantin, Thanks for the responses. The data mining tool looks promising, and as you state, allows for some "extra" goodness too. Gavin. On 14/04/2011, at 2:20 AM, Stefan Sperling wrote: > On Wed, Apr 13, 2011 at 11:27:22AM +1000, Gavin "Beau" Baumanis wrote: >> I have been doin

Re: Updating the WC from an non svn directory

2011-04-13 Thread Ryan Schmidt
On Apr 13, 2011, at 15:43, Ryan Schmidt wrote: > you can do a search here: > > http://svn.haxx.se/user/ Sorry, that should have been: http://svn.haxx.se/users/

Re: Updating the WC from an non svn directory

2011-04-13 Thread Ryan Schmidt
On Apr 13, 2011, at 06:30, Peter@locotel wrote: > The issue is that svn is not adapted to support web applications that live > under > web-servers. Others have already replied, but I wanted to provide yet another affirmation that Subversion works great for web development -- I've been using it

Re: Updating the WC from an non svn directory

2011-04-13 Thread Thorsten Schöning
Guten Tag Peter@locotel, am Mittwoch, 13. April 2011 um 13:30 schrieben Sie: > The issue is that svn is not adapted to support web applications that > live under > web-servers. You can use it pretty fine this way, I do for Perl web applications processed by Apache HTTPD, Java web applications und

Re: Finding the revision of a deleted file.

2011-04-13 Thread Stefan Sperling
On Wed, Apr 13, 2011 at 11:27:22AM +1000, Gavin "Beau" Baumanis wrote: > I have been doing some work everyone's good friend Mr.Google. > Every blog / article I read all said the same thing; > > Create a file with svn log > (svn log --verbose > svn.log) > Then grep / search the log for the file you

Re: Subversion, symbolic links, and CIFS mounts

2011-04-13 Thread Stefan Sperling
On Wed, Apr 13, 2011 at 11:17:18AM -0400, Desjardin, Donald wrote: > In the following example we have sym-links called CURRENT_BLAH_BLAH that > point to the correct firmware file. During the checkout, if the > destination has been created before the link, it works, if the link > happens to get cre

Subversion, symbolic links, and CIFS mounts

2011-04-13 Thread Desjardin, Donald
I am seeing a consistent problem with subversion checkouts into a CIFS mount, and the creation of sym-links. I wanted to see if anyone else has see this before I report it. I can create sym-links on the CIFS mount manually, both to an existing destination and to a destination that doesn't exist

Re: Updating the WC from an non svn directory

2011-04-13 Thread Andy Levy
2011/4/13 Peter@locotel > > Thank u for your answer, > I completely appreciate all your points referring to the proper use of > subversion. > The issue is that svn is not adapted to support web applications that live > under > web-servers. It works perfectly fine for this, provided you use it p

Re: Updating the WC from an non svn directory

2011-04-13 Thread Peter@locotel
Thank u for your answer, I completely appreciate all your points referring to the proper use of subversion. The issue is that svn is not adapted to support web applications that live under web-servers. You have to export from repository to the web directory every so often to update the operational

Re: Finding the revision of a deleted file.

2011-04-13 Thread Konstantin Kolinko
If you do not know the path to the file, then I think svn ls --depth=infinity together with peg revision set in the past will help you to locate it. Then you can use svn log on the file to see when it was deleted and svn cp it from any revision before that. Best regards, Konstantin Kolinko 201

Re: Finding the revision of a deleted file.

2011-04-13 Thread Gavin "Beau" Baumanis
It's always the way I should have been a little more clearer about my requirements. I have a file; fileName.txt This file exists "somewhere" in the repository at a previous revision because it was deleted at sometime in the past. So, I am unable to restrict the path that svn.log starts at.

Re: Updating the WC from an non svn directory

2011-04-13 Thread Thorsten Schöning
Guten Tag Peter@locotel, am Mittwoch, 13. April 2011 um 11:28 schrieben Sie: > The development in not done on my working copy. It is done by my > developers and > testing programs are uploaded to the web server preview directory so > they can be > tested in real scenarios and test users. If tests

Re:

2011-04-13 Thread Thorsten Schöning
Guten Tag Peter@locotel, am Mittwoch, 13. April 2011 um 10:33 schrieben Sie: > The development in not done on my working copy. It is done by my > developers and > testing programs are uploaded to the web server preview directory so > they can be > tested in real scenarios and test users. If tests

Updating the WC from an non svn directory

2011-04-13 Thread Peter@locotel
Hi All, I want to know if that is possible and how should I do it. My repository has the been imported with the contents (/var/www) of my web server. After a checkout my working copy also has been updated with the same content. The development in not done on my working copy. It is done by my devel

[no subject]

2011-04-13 Thread Peter@locotel
Hi All, I want to know if that is possible and how should I do it. My repository has the been imported with the contents (/var/www) of my web server. After a checkout my working copy also has been updated with the same content. The development in not done on my working copy. It is done by my devel

Re: [PATCH] Update some German translations

2011-04-13 Thread David Ayers
Hallo Daniel, Am Mittwoch, den 13.04.2011, 10:49 +0300 schrieb Daniel Shahaf: > On Tue, 12 Apr 2011 20:32 +0200, "David Ayers" wrote: > > I stumbled over a typo in the German translations that I also found in > > the current trunk. I also reviewed some other translations while I > > was in the

Re: [PATCH] Update some German translations

2011-04-13 Thread Daniel Shahaf
David, On Tue, 12 Apr 2011 20:32 +0200, "David Ayers" wrote: > Hello, > > I stumbled over a typo in the German translations that I also found in > the current trunk. I also reviewed some other translations while I > was in the file. Please find attached patch to the German > translations. > Th

Re: Finding the revision of a deleted file.

2011-04-13 Thread Daniel Shahaf
On Wed, 13 Apr 2011 10:52 +0400, "Konstantin Kolinko" wrote: > 2011/4/13 Gavin "Beau" Baumanis : > > Is there not a more convenient way to do this? > > Binary search with 'svn info'?

Re: svnsync error : Error while replaying commit

2011-04-13 Thread Thorsten Schöning
Guten Tag ankush chadha, am Dienstag, 12. April 2011 um 18:46 schrieben Sie: > Is there any way to get around this problem. I updated all the permissions but > the problem is that A was created like years back and I won't be able to > mirror > those revisions. Access restrictions are not version