mergeinfo

Git-SVN with svn.pushmergeinfo: how to avoid self-referencing mergeinfo lines

北战南征 提交于 2019-12-18 12:26:13
问题 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

How do I avoid large number of svn:mergeInfo when merging trunk to a feature-branch in SVN

人走茶凉 提交于 2019-12-12 08:47:47
问题 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

SVN modifies svn:mergeinfo property on files with no change

自作多情 提交于 2019-12-10 15:52:57
问题 I've a "problem" with svn I can't understand why sometimes when I merge two branches it reports modify on mergeinfo property on files with no changes on the text. Is it a normal behavior? If not, what can be the problem? 回答1: Well, you did merge those two branches. Right? Works as expected. What you did was do a merge. Even though the merge didn't result in any code changes, and that's not uncommon with merges, Subversion still marks that a merge was done. If nothing else, marking that you

How do I avoid large number of svn:mergeInfo when merging trunk to a feature-branch in SVN

送分小仙女□ 提交于 2019-12-04 05:42:11
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 )

Git-SVN with svn.pushmergeinfo: how to avoid self-referencing mergeinfo lines

社会主义新天地 提交于 2019-11-30 07:13:25
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

SVN: Branch and reintegrate is not working with updated server

◇◆丶佛笑我妖孽 提交于 2019-11-28 12:18:59
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:

SVN: Branch and reintegrate is not working with updated server

◇◆丶佛笑我妖孽 提交于 2019-11-27 06:58:15
问题 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