Re: Tortoise SVN Issue Noticed

2013-04-29 Thread Johan Corveleyn
On Mon, Apr 29, 2013 at 7:33 AM, Ajay Pawar ajay.pa...@kpitcummins.com wrote: Hi Lorenz, Scenario #1 Thanks for your quick response but when I add the same file in repo browser and then take an update it is showing me the same size . SVN will not transmit the entire file contents if it

How to fix a merge conflict on a directory?

2013-04-29 Thread David Aldrich
Hi As a result of merging from trunk to a branch using a 1.7 svn client. Several directories now have conflicts. For example, directory 'Documents' contains dir_conflicts.prej, which contains: Trying to delete property 'svn:mergeinfo' but the local property value is different. (local property

Re: Tortoise SVN Issue Noticed

2013-04-29 Thread Thorsten Schöning
Guten Tag Ajay Pawar, am Montag, 29. April 2013 um 12:08 schrieben Sie: I added a new file XYZ.ppt which is of size 984 kb but still the client shows 0 kb. As already said, Subversion uses delta transmission, compresses content on transmission and my even use some kind of

Re: Tortoise SVN Issue Noticed

2013-04-29 Thread Johan Corveleyn
On Mon, Apr 29, 2013 at 12:17 PM, Thorsten Schöning tschoen...@am-soft.de wrote: Guten Tag Ajay Pawar, am Montag, 29. April 2013 um 12:08 schrieben Sie: I added a new file XYZ.ppt which is of size 984 kb but still the client shows 0 kb. As already said, Subversion uses delta transmission,

Re: Tortoise SVN Issue Noticed

2013-04-29 Thread Martin Bischoff
There is definitely a bug in the display of the data transfer progress. See here for an old discussion on the tortoisesvn-users list: http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061dsMessageId=2991921 But it seems the root cause is somewhere in SVN. It has to do with issue 3260:

Re: Tortoise SVN Issue Noticed

2013-04-29 Thread Johan Corveleyn
On Mon, Apr 29, 2013 at 1:16 PM, Martin Bischoff tin...@gmail.com wrote: On Mon, Apr 29, 2013 at 12:26 PM, Johan Corveleyn jcor...@gmail.com wrote: On Mon, Apr 29, 2013 at 12:17 PM, Thorsten Schöning tschoen...@am-soft.de wrote: Guten Tag Ajay Pawar, am Montag, 29. April 2013 um 12:08

svnserve: DIGEST-MD5 common mech free

2013-04-29 Thread raichea
I repeatedly get this message in my server log. Googling has shown that I'm not alone, although not everyone reports the message coming from svn. Other than that, it has shed little light on what the problem might be apart from it being somehow related to SASL. My SVN server is not using SASL

backlogging with subversion?

2013-04-29 Thread Ryan Tarrant
Is there a way to do product backlogging with subversion? I'm looking for a way to manage tasks associated with projects where I can prioritize tasks that might hopefully be something like a plugin or extension of subversion. Currently I have subversion running on a linux server and we're using

RE: backlogging with subversion?

2013-04-29 Thread Cooke, Mark
-Original Message- From: Ryan Tarrant [mailto:rtarr...@neibenefits.org] Sent: 29 April 2013 15:19 To: users@subversion.apache.org Subject: backlogging with subversion? Is there a way to do product backlogging with subversion? I'm looking for a way to manage tasks associated with

RE: backlogging with subversion?

2013-04-29 Thread Ryan Tarrant
Thanks! I'm starting to get the Trac setup on my windows client, but would it make more sense to put this on my linux server? Ryan J. Tarrant Software Engineer National Elevator Industry Benefit Plans Telephone: 1-610-325-9100 EXT. 2217 Fax: 1-610-557-4505 Email: rtarr...@neibenefits.org

Re: backlogging with subversion?

2013-04-29 Thread Chris Shelton
Trac must be installed on to the same machine that serves your subversion repository. That should simplify your decision a bit. chris On Mon, Apr 29, 2013 at 12:00 PM, Ryan Tarrant rtarr...@neibenefits.orgwrote: Thanks! I'm starting to get the Trac setup on my windows client, but would it

RE: Tortoise SVN Issue Noticed

2013-04-29 Thread Bert Huijben
-Original Message- From: Johan Corveleyn [mailto:jcor...@gmail.com] Sent: maandag 29 april 2013 13:31 To: Martin Bischoff Cc: Ajay Pawar; users@subversion.apache.org; Thorsten Schöning Subject: Re: Tortoise SVN Issue Noticed On Mon, Apr 29, 2013 at 1:16 PM, Martin Bischoff

Re: Files on trunk overwritten...

2013-04-29 Thread C M
The working copy (head revision) is at 661. 177 is what I want to go back to. Is this the syntax to use (from within the working copy: svn merge -r661:177? On Fri, Apr 26, 2013 at 8:53 PM, Les Mikesell lesmikes...@gmail.com wrote: On Fri, Apr 26, 2013 at 6:18 PM, C M cmanalys...@gmail.com

Re: Files on trunk overwritten...

2013-04-29 Thread Les Mikesell
On Mon, Apr 29, 2013 at 1:23 PM, C M cmanalys...@gmail.com wrote: The working copy (head revision) is at 661. 177 is what I want to go back to. Is this the syntax to use (from within the working copy: svn merge -r661:177? Yes but that should undo all changes after 177 and you might only

Re: questions about subversion secondary development

2013-04-29 Thread Alagazam.net Subversion
On 2013-04-29 10:36, Cooke, Mark wrote: -Original Message- From: Edwin Cheung [mailto:edoka...@gmail.com] Sent: 27 April 2013 07:55 To: users@subversion.apache.org Subject: questions about subversion secondary development Dear sir or madam: When I use the binary packages (

Conflicts with merge

2013-04-29 Thread Olivier Antoine
Hi, Trying to understand how merge works for svn, I did a merge from a branch to trunk, and I get this: Skipped 'test1.c' -- Node remains in conflict Uhomo_script_sql.sql Skipped 'ARBO1' -- Node remains in conflict Uhomo_script_ddl.sql Skipped 't.dat' -- Node remains in conflict Skipped

Re: How to fix a merge conflict on a directory?

2013-04-29 Thread Daniel Shahaf
For starters, figure out what the difference is between the value the merge wants to delete (the value on the LHS of the merge) and the value in the working copy (which had no local mods prior to running 'merge', right?). I wonder if the issue is that special logic for svn:mergeinfo kicks in only

Re: svnserve: DIGEST-MD5 common mech free

2013-04-29 Thread Daniel Shahaf
raichea wrote on Mon, Apr 29, 2013 at 14:28:30 +0100: I repeatedly get this message in my server log. Googling has shown that I'm not alone, although not everyone reports the message coming from svn. Other than that, it has shed little light on what the problem might be apart from it

Re: backlogging with subversion?

2013-04-29 Thread Daniel Shahaf
Cooke, Mark wrote on Mon, Apr 29, 2013 at 15:30:31 +0100: -Original Message- From: Ryan Tarrant [mailto:rtarr...@neibenefits.org] Sent: 29 April 2013 15:19 To: users@subversion.apache.org Subject: backlogging with subversion? Is there a way to do product backlogging with

Re: svnserve: DIGEST-MD5 common mech free

2013-04-29 Thread raichea
On 29/04/2013 21:55, Daniel Shahaf wrote: The fact it's commented out rather than not present implies svnserve was built with SASL support; 'svnserve --version' will confirm that. Just a possibly-relevant fact... Daniel Hmm, thanks... well, the output from that command includes: Cyrus SASL

Re: svnserve: DIGEST-MD5 common mech free

2013-04-29 Thread Daniel Shahaf
raichea wrote on Mon, Apr 29, 2013 at 23:01:51 +0100: On 29/04/2013 21:55, Daniel Shahaf wrote: The fact it's commented out rather than not present implies svnserve was built with SASL support; 'svnserve --version' will confirm that. Just a possibly-relevant fact... Daniel Hmm, thanks...