Re: merge disagrees with diff

2011-10-28 Thread Ulrich Eckhardt
Am 28.10.2011 11:55, schrieb Flemming Frandsen: We're having a major problem with subversion, it seems that for some changesets svn merge will do a different change than svn diff would suggest. It took me a while of scrolling up and down to find the difference, but IIUC the problem is A) that

Re: merge disagrees with diff

2011-10-28 Thread Johan Corveleyn
On Fri, Oct 28, 2011 at 11:55 AM, Flemming Frandsen dren...@gmail.com wrote: We're having a major problem with subversion, it seems that for some changesets svn merge will do a different change than svn diff would suggest. Here's an example of that the problem looks like: svn diff -c

Re: tortoise 1.7 - error on repository manipulation

2011-10-28 Thread Erwane Breton
Le 28/10/2011 10:51, Daniel Shahaf a écrit : Erwane, can you provide a minimal server configuration that reproduces the bug? The svn devs used 1.7 clients against a 1.6.17 svn.apache.org for a long time without seeing any such errors, so I suspect the issue is due to your configuration

Re: merge disagrees with diff

2011-10-28 Thread Flemming Frandsen
On Fri, Oct 28, 2011 at 12:31 PM, Johan Corveleyn jcor...@gmail.com wrote: Here is something I don't understand. You just did a new checkout to someotherpath. The HEAD of your repository is at least 648291. How come that someotherpath/stepws.xsd is at revision 610503? That doesn't make sense.

Re: merge disagrees with diff

2011-10-28 Thread Andreas Krey
On Fri, 28 Oct 2011 12:49:35 +, Flemming Frandsen wrote: ... This is not the only time I've seen the problem manifest, but the circumstances where similar, in the other case another developer was trying to merge a change from version-1 to version-2, he too got extra changes in his merge

Re: merge disagrees with diff

2011-10-28 Thread Flemming Frandsen
On Fri, Oct 28, 2011 at 12:58 PM, Andreas Krey a.k...@gmx.de wrote: You didn't get a clean merge; you got a conflict. When you get a conflict, it is your job to look at what you merged and at the proposed result, and resolve it yourself. Yes, I have seen conflicts before, that's not what the

update --depth=empty ignored since 1.7

2011-10-28 Thread Mojca Miklavec
Dear list, I'm experiencing some weird behaviour with SVN 1.7. The following sequence of commands fails to respect --depth=empty:    svn co --depth=empty http://foundry.supelec.fr/svn/metapost    svn up --depth=empty metapost/tags (you can use 'anonymous' as a username) The first command runs

Re: update --depth=empty ignored since 1.7

2011-10-28 Thread Philip Martin
Mojca Miklavec mojca.miklavec.li...@gmail.com writes: I'm experiencing some weird behaviour with SVN 1.7. The following sequence of commands fails to respect --depth=empty:    svn co --depth=empty http://foundry.supelec.fr/svn/metapost    svn up --depth=empty metapost/tags (you can use

Re: merge disagrees with diff

2011-10-28 Thread Andreas Krey
On Fri, 28 Oct 2011 13:02:05 +, Flemming Frandsen wrote: ... The problem is that there are many more changes in the conflicted block than the diff suggested, iow: svn merge tried to add more lines than svn diff said it would. That only looks like that because of the way merging is

Re: merge disagrees with diff

2011-10-28 Thread Stefan Sperling
On Fri, Oct 28, 2011 at 01:02:05PM +0200, Flemming Frandsen wrote: On Fri, Oct 28, 2011 at 12:58 PM, Andreas Krey a.k...@gmx.de wrote: You didn't get a clean merge; you got a conflict. When you get a conflict, it is your job to look at what you merged and at the proposed result, and resolve

Re: merge disagrees with diff

2011-10-28 Thread Flemming Frandsen
On Fri, Oct 28, 2011 at 2:19 PM, Stefan Sperling s...@elego.de wrote: Does this explanation make sense? Yes, very much, thank you for taking your time to look into this for me, I'm sorry to have inconvenienced you, but hopefully someone with the same problem will find the thread and be

Re: merge disagrees with diff

2011-10-28 Thread Flemming Frandsen
On Fri, Oct 28, 2011 at 2:00 PM, Andreas Krey a.k...@gmx.de wrote: That only looks like that because of the way merging is described in the book. Aaah! RTFM, is it? In essence, svn sees only two different (and conflicting) changes to a block of lines, and leaves it to you to deal with that.

Subversion Exception

2011-10-28 Thread Stephen Flowers
--- Subversion Exception! --- Subversion encountered a serious problem. Please take the time to report this on the Subversion mailing list with as much information as possible about what you were trying to do. But please first search the mailing

update --depth=empty ignored since 1.7

2011-10-28 Thread Mojca Miklavec
Dear list, I'm experiencing some weird behaviour of SVN 1.7. The following sequence of commands fails to respect --depth=empty: svn co --depth=empty http://foundry.supelec.fr/svn/metapost svn up --depth=empty metapost/tags (you can use 'anonymous' as a username if it asks) The first

Re: Subversion Exception

2011-10-28 Thread Stefan Sperling
On Fri, Oct 28, 2011 at 01:20:52PM +0100, Stephen Flowers wrote: --- Subversion Exception! --- Subversion encountered a serious problem. Please take the time to report this on the Subversion mailing list with as much information as possible

ANNOUNCE: svnfiltereddump 1.0 Beta available

2011-10-28 Thread Harald Wilhelmi
Hello, a new open source tool for reorganizing Subversion repositories was released. It is optimized to extract parts of a large repository to form a new smaller one. It is similar in purpose to svndumpfilter (standard SVN tool) and Simon Tatham's svndumpfilter2 (*). However it is has less

Re: tortoise 1.7 - error on repository manipulation

2011-10-28 Thread Mike Dixon
On 10/28/2011 2:41 AM, Stefan Sperling wrote: On Thu, Oct 27, 2011 at 04:19:54PM +0200, Erwane Breton wrote: The error is always the same Commit Commit failed (details follow): '/svn/site/*!svn/me*' path not found My repository is https://xyz.coda-cola.net/svn/site/trunk I've tried

First Hands-on Subversion—Where/How?

2011-10-28 Thread Pietro Moras
Dear Subversion cognoscenti, Seriously intentioned to explore what Subversion is all about, armed with good will and a good reference book (“Version Control with Subversion”, by Ben Collins-Sussman, Brian W. Fitzpatrick, C. Michael Pilato), I got immediately lost stuck at the very

Re: First Hands-on Subversion—Where/How?

2011-10-28 Thread Geoff Hoffman
On Fri, Oct 28, 2011 at 11:00 AM, Pietro Moras studio...@hotmail.comwrote: Dear Subversion cognoscenti, Seriously intentioned to explore what Subversion is all about, armed with good will and a good reference book (“Version Control with Subversion”, by Ben Collins-Sussman, Brian W.

RE: First Hands-on Subversion—Where/How?

2011-10-28 Thread Pietro Moras
more specific questions My pleasure, dear Geoff, Here you have some very Specific Questions. SQ1] How to get what I presume is a nice Subversion prompt: $ on one of my standard Windows machines, so to test the wonderful Subversion commands so eloquently described by the

Re: First Hands-on Subversion—Where/How?

2011-10-28 Thread Geoff Hoffman
On Fri, Oct 28, 2011 at 3:52 PM, Pietro Moras studio...@hotmail.com wrote: more specific questions My pleasure, dear Geoff, Here you have some very Specific Questions. SQ1] How to get what I presume is a nice Subversion prompt: $ There is no prompt, other than terminal. Read the

Re: First Hands-on Subversion—Where/How?

2011-10-28 Thread Alexey Neyman
Dear Pietro, I think you should start your learning Subversion from learning what a command line is. Subversion manual is no substitute for knowing the OS. Or alternatively, have someone install a repostory for you and go with a GUI client, such as TortoiseSVN. Regards, Alexey. On Friday,

Re: First Hands-on Subversion—Where/How?

2011-10-28 Thread Dave Huang
On Oct 28, 2011, at 5:52 PM, Pietro Moras wrote: more specific questions My pleasure, dear Geoff, Here you have some very Specific Questions. SQ1] How to get what I presume is a nice Subversion prompt: $ on one of my standard Windows machines, so to test the wonderful

Re: tortoise 1.7 - error on repository manipulation

2011-10-28 Thread Daniel Shahaf
Erwane Breton wrote on Fri, Oct 28, 2011 at 12:31:52 +0200: The install of my virtualbox, for Daniel Shahaf, maybe solved the problem, in local. If it's work with minimal configuration, something goes wrong in my apache config. If you find what the problem was, please post back to the

Re: SVN repo cross-platform compatibility

2011-10-28 Thread Nico Kadel-Garcia
On Wed, Oct 26, 2011 at 7:23 AM, Neil Bird n...@jibbyjobby.co.uk wrote:  Whilst suffering a subversion server outage, it's made me wonder:  we currently produce nightly backups of our repos via 'hotcopy' from the server's local drive to a network store.  If the server were to die, would I be

Working SRPM and .spec files for subversion-1.7.1

2011-10-28 Thread Nico Kadel-Garcia
For various reasons, I've been working on RPM packaging of 1.7.0 and now 1.7.1. I'd like to get the old packages/rpm structure replaced with it, and I'm trying to get it into RPMforge. It's built from the Fedora packaging of subversion-1.6.17, and most of the patches are no longer needed (because

Re: svnlook issue

2011-10-28 Thread Ryan Schmidt
On Oct 28, 2011, at 19:37, Bruce Vining wrote: I have been using Subversion flawlessly (and happily) now for the past 6 months but performed the latest update via the Web Interface (Collabnet Subversion Edge) and now I have hell to pay. For the past 6 months I have been successfully