[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Lost work due to non-cummutative merges

From: Christoph Bartoschek <bartoschek_at_or.uni-bonn.de>
Date: Wed, 22 Jun 2011 21:25:29 +0200


we have the following situation:

1. A branch is created from trunk.
2. In trunk a line of code is added and commited as revision X
3. The line is removed again and commited as revision X+1
4. In branch changeset X+1 is merged from trunk
5. In branch changeset X is merged from trunk.

The problem is now that in the branch the line is still there and one
gets no warning from subversion that something is wrong.

Is this a bug in subversion? Why isn't there at least a merge conflict
for step 4?

Received on 2011-06-22 21:26:05 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.