2

We have a SVN repository. There are many branches on the repository. Most files in repository are text files, but there are some binray files (some .xls and .fla files) on each branch. These binary files cannot be automatically merged, so we set svn:needs-lock on these files.

The problem is, even when I have locked a file on one branch, other people still can modify that file on another branch. Finally when we merge changes between branches, these files conflict.

What is the best way to handle this situation?

Yang Bo
  • 3,586
  • 3
  • 22
  • 35
  • (I'm not entirely sure why this received a "not constructive" vote ..) –  Aug 17 '12 at 00:44
  • Even if you could lock the file on all branches somehow, wouldn't you still run into the same problem if two people edited (using lock-modify-unlock) the same file in different branches at different times? Just trying to understand the problem you're facing here. – Greg Hewgill Aug 17 '12 at 00:48
  • @GregHewgill You are right. I think I need a way to mark a file on a branch is 'immutable', until all changes from other branches are merged. – Yang Bo Aug 17 '12 at 00:53

1 Answers1

1

The other approach would be to let the conflict happen and ignore them for those file:

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • This approach is good for generated files, but not for my case. Our binary files are some .xls files. – Yang Bo Aug 17 '12 at 21:00