mergeinfo

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 SVN history is so big, that it renders the merge commit history unusable as it is marking literally thousands of files changed, even though the only change to these files, is done by SVN itself. I have tried Using the same client version as the Repo ( 1.5.2 )

In recent versions of git, the configuration svn.pushmergeinfo was introduced: config key: svn.pushmergeinfo This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN. We're using this to have a mixed environment where some developers use SVN and some use Git-SVN. This works great when branching and merging SVN-branches in Git and then git svn dcommit -ing back to SVN, and it

I am working with a Subversion server that was recently upgraded to version 1.7. I am using the command-line Linux client 1.7.10. I created a branch like this: %: svn copy svn+ssh://acme.com/a/b/c/trunk svn+ssh://acme.com/a/b/c/branches/ovm_sequencer -m "Feature branch for ovm_sequencer" After a couple of edits, I tried to reintegrate into the trunk and only ran into problems: %: svn merge --reintegrate '^/c/branches/ovm_sequencer' svn: E160013: File not found: revision 1677, path '/c/branches/ovm_sequencer' %: svn merge --reintegrate svn+ssh://acme.com/a/b/c/branches/ovm_sequencer svn: