Hi, first, let me thank all people behind subversion for a great tool! Although I've been using svn for many years, this is my first post here;-)
In a current project I had created a branch (branches/mine) of another branch (branches/lutz). I am implementing a nice addon in my branch that shall go back to trunk/ sometime soon. However, yesterday branches/lutz was "merged" into trunk/ – to me it seems as that was done by a strange sequence of deletions/moves/copies. Now I am looking for a way to keep automatic merging alive. I believe I have to formally "ignore" one revision for that to work. Anyhow, I have merged all changesets from branches/lutz (which goes to r1380, so I merged up that that revision) into branches/mine. Then I have merged r1382:HEAD from trunk/ into my branch, which works fine. r1381 was the "move" of branches/lutz to trunk/, which I want to ignore because it pulls a lot of strange and "wrong" actions (resulting in infinitely many conflicts) into my branch. I assume I can continue to manually specify which changesets to merge. However, is there a way to tell svn (the repository) to permanently ignore r1381 for merging? Greetings, Jochen -- Fritz-Haber-Institut der MPG - Department of Molecular Physics - Manipulation of Large Molecules Faradayweg 4-6 (C1.03) D-14195 Berlin, Germany phone: +49-30-8413-4351 / -5686 fax: +49-30-84135892 skype: jochen.kuepper http://www.fhi-berlin.mpg.de/mp/jochen
