> However, the merge meisters I've met are usually more competent in
> using svn than the average developer in the same organisation. Often
> they're even the local svn gurus. I would trust them to give special
> consideration for files with svn:hold. If the merge meister cannot
> handle this it's possible to fall back to the template solution
> people are using now.
I do not have the faith in mergemeisters you do. I think when you
merge to a file that is on hold,
1) If you have no local mods to this file, it should somehow be marked
to be exempt from the hold until it is committed. (A temporary file
2) If you do have local mods, this should be treated similar to a
textual conflict: that file can't be committed (and a recursive
commit on the directory the file is in will also fail) until it is
resolved manually in some way. The manual resolution moves the file
to state 1).
Of course, it's still possible to get into a bad situation by doing a
merge and _then_ some local mods that are not supposed to be committed.
I'd be willing to just say "so don't do that, then".
Received on 2011-08-24 22:31:32 CEST