On Wed, Aug 24, 2011 at 1:09 PM, Stefan Sperling <s...@elego.de> wrote:
> On Wed, Aug 24, 2011 at 12:05:00PM -0400, Mark Phippard wrote: > > Merge remains a problem. Namely that if merge updates files with the > > svn:hold property the changes to those files will not be committed. > > I would say just let it be that way. It shouldn't matter whether > local mods come from merges or from manual edits. > > If the changes being merged into a held file are important, > then there's a user error -- the file should probably not > have been held in the first place. > I disagree. When I have wanted this feature in the past it has been for server apps where I have a default configuration file with various properties. Developers often need to insert passwords in these files and do not want to commit, but it is very common for the file to evolve over time and add new properties etc. I would want and expect those values to merge and commit between branches. -- Thanks Mark Phippard http://markphip.blogspot.com/
