Re: Merge bug causes changesets to be applied although this should not be the case

Hello! Julian Foad schrieb am Thu, 11 Apr 2013 20:59:56 +0100 (BST): [...] the problem is that [...] no conflict is _detected_ at all. I agree that this behaviour is not good when you want strict conflict detection. This particular behaviour is just one of several heuristics in Subversi

Re: Merge bug causes changesets to be applied although this should not be the case

Hello! Stefan Sperling schrieb am Thu, 11 Apr 2013 20:11:23 +0200: Yes, but silently ignoring the deletion of a non-existing file part is not a sound decision in my opinion. Well, the change says "this section of the file should not be there anymore, get rid of it". But the section in questio

Re: Merge bug causes changesets to be applied although this should not be the case

Hello! Stefan Sperling schrieb am Thu, 11 Apr 2013 20:11:23 +0200: Yes, this is an important distinction. But detection only makes sense if there is more than one way of resolution, doesn't it? An additional aspect I forgot in my last answer: Subversion is inconsistent here when comparing t

Re: Merge bug causes changesets to be applied although this should not be the case

hen I don't see a need to change Subversion's behaviour. Sorry, I did not talk about conflict _resolution_ but about conflict _detection_. This is not the same thing. You may resolve this type of conflict as you already do, I have no problems with that. However, the problem is that even with

Re: Merge bug causes changesets to be applied although this should not be the case

Hello! Paul Burba schrieb am Thu, 11 Apr 2013 10:45:34 -0400: What do you mean exactly? The file could me marked as resolved via "svn resolve" if that's what the user wants, couldn't it? I was asking what contents of the resolved file would be; not the mechanics of resolution. Lets assume fo

Re: Merge bug causes changesets to be applied although this should not be the case

esting's files.txt to have the same contents as the one in trunk (what wasn't the case), so I had to manually fix the files.txt in the testing branch despite all changes to files.txt have been correctly merged from trunk. Regards, Christoph Schulz pgpg5lib0j43W.pgp Description: Digitale PGP-Signatur

Merge bug causes changesets to be applied although this should not be the case

svn merge" allows to apply files2.patch before files1.patch, which is clearly wrong. Is this a known bug? Do any workarounds exist to prevent this bug from occurring? Regards, Christoph Schulz #!/bin/sh svnadmin create ~/mergetest-repo svn co file://$HOME/mergetest-repo mergetest cd me