2010/4/20 Jochen Küpper <joc...@fhi-berlin.mpg.de>: > However, is there a way to tell svn (the repository) to permanently ignore > r1381 for merging?
svn merge --record-only It creates a mergeinfo as if the merge already happened. See "Blocking Changes" here: http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html Best regards, Konstantin Kolinko