From: Brian M. <br...@gr...> - 2011-04-05 01:37:33
|
Nick, > > Most of what I read suggests that newer subversion > clients won't show this problem. I guess time will tell. > > Thanks for the links. It looks like it could be the > svn client > version. What version are you using? I'm using Subclipse which is using JavaHL 1.6.12. > We recommend merging from the root directory, which is > suggested in one > of your links. I'm pretty sure I always merge from the root. But I guess I can't be positive since the tool always does it for me. I'll watch the command line output next time I merge. > > I don't know of anyone on the Gramps project who > actually needs the mergeinfo. If someone wanted to delete > all the mergeinfo properties, it probably wouldn't do any > harm. > > We could delete them, or we could remove them before the > commit. I'll try to look out for them and delete them before I commit from now on. ~BM |