We try to keep the 'svn:mergeinfo' property on the root branch folder only. However, we keep seeing it creep into subfolders. We've been able to identify some possible causes: Moving a folder in the repo-browser Moving and/or renaming packages in IntelliJ Using old svn clients Can anyone provide a list of things we should not do in o...
I'd like to avoid creating svn mergeinfo property on anything but the root of branches. We have a trunk branch and some other branches. Assuming I know absolutely nothing about svn triggers, what steps do I need to follow to setup a pre-commit hook that prevents additions of mergeinfo properties to anything but the root of branches? Th...
If you've done a merge you may find, before committing the changes, that actually you don't want to accept any of the changes merged into one of the affected files. So you do e.g.: $ svn revert foo.c However this also seems to revert the mergeinfo related to this file. So when you do a subsequent merge it will merge in exactly the same...
I have subversion 1.6.5 client and 1.5.4 server. And I mostly only care about diffs on fully repository paths, not working copies. When diffing branches, ones that have been merged already show up as identical except for the mergeinfo properties. This is a touch annoying for a human who has to then look through the changes looking for ...
I have a couple of files that always seem to be getting new svn:mergeinfo set on various merge tasks performed through the regular work cycle of merges. The file has not changed in months, but the mergeinfo is persistently touched. I have a feeling that the mergeinfo got confused at some point and never recovered. I'm not sure what to l...
I would like to use a pre-commit hook that prevents developers from setting svn:mergeinfo on non-root directories. That is, I want to enforce that svn:mergeinfo can only be set on directories like "trunk" or "branches/branchName". Developers sometimes need to be "reminded" that it's not good practice to use a subdirectory of the root a...
We have a SVN repository structure with feature branches, where we finally do a svn merge --reintegrate into the trunk. This usually works fine (so far we had about 200 feature branches reintegrated). Now, when trying svn merge --reintegrate, we received the following error message: svn: Reintegrate can only be used if revisions 94538 t...
I am trying to keep a feature branch up to date by merging trunk into the branch. Problem is, that about 2000 files that was there when the branch was created, and that has been left untouched on both the branch and on trunk is getting updated with nothing but svn:mergeinfo. The project is rather large in scale, and the impact on our SV...