Questions tagged [mergeinfo]
39 questions
19
votes
2 answers
Svn pre-commit hook to disallow svn:mergeinfo on non-root directories
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…
Stuart Lange
- 4,049
- 6
- 24
- 30
19
votes
3 answers
What's SVN's actual use of mergeinfo?
I've long heard about svn's merge-conflict troubles.
I was relieved, thought, when I learnt that svn a couple of releases ago implemented a feature called mergeinfo. It almost seemed as if its introduction would allow svn to have enough information…
devoured elysium
- 101,373
- 131
- 340
- 557
11
votes
1 answer
Git-SVN with svn.pushmergeinfo: how to avoid self-referencing mergeinfo lines
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.…
Avish
- 4,516
- 19
- 28
11
votes
1 answer
git-svn workflow for merging using svn.pushmergeinfo
What is the correct workflow for merging svn tracked branches using git-svn. I've read a little about the git-svn svn.pushmergeinfo config key, and the caveats are:
From http://www.kernel.org/pub/software/scm/git/docs/git-svn.html:
config key:…
Dougnukem
- 14,709
- 24
- 89
- 130
10
votes
1 answer
When is it appropriate to use the --ignore-ancestry option when merging in subversion
I think I must be missing something fundamental in my understanding which is preventing me from getting my head around this.
In what situations would you want to use the --ignore-ancestry option when performing a merge? It is my understanding that…
BadAtMaths
- 215
- 2
- 7
9
votes
4 answers
How to avoid svn:mergeinfos on sub-folders?
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…
ripper234
- 222,824
- 274
- 634
- 905
7
votes
1 answer
How do you get a Subversion diff summary to ignore mergeinfo properties?
I have the 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…
Gordon Wrigley
- 11,015
- 10
- 48
- 62
6
votes
4 answers
How do I avoid large number of svn:mergeInfo when merging trunk to a feature-branch in SVN
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…
NielsBjerg
- 701
- 4
- 9
6
votes
3 answers
SVN: Branch and reintegrate is not working with updated server
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…
Hackonteur
- 821
- 7
- 12
5
votes
2 answers
SVN 1.8 merge (branch reuse) seems broken when having local mergeinfo
We have a problem with the new 1.8 subversion clients (we use TortoiseSVN 1.8.5 & SlikSVN 1.8.5). It seems that the new SVN 1.8 feature of being able to keep using your feature branch after reintegration is not working in some cases.
It is not…
Halt
- 2,924
- 4
- 22
- 26
5
votes
2 answers
committing only the svn merge info
We are merging changes from the trunk to the branch. While we do this, the merge info gets recorded.
Since there might be other changes in the branch, is there a safe way to commit only the files affected due to the merge (assuming no other changes…
Abhilash L L
- 366
- 2
- 7
- 16
4
votes
1 answer
The mergeinfo of a single file is always being touched
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…
javafueled
- 494
- 1
- 5
- 23
4
votes
2 answers
SVN modifies svn:mergeinfo property on files with no change
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?
rascio
- 8,968
- 19
- 68
- 108
3
votes
1 answer
Tortoise 1.9: Merge does not record mergeinfo
I'm using Tortoise 1.9 as a SVN-client for a Apache Subversion Server 1.7.
I realize that none of my merges are recorded to svn:mergeinfo. Neither "svn mergeinfo --show-revs" nor the Tortoise property-display show the merged revisions.
Merges of…
Ulrich
- 715
- 2
- 7
- 25
2
votes
1 answer
Long svn:mergeinfo on SVN directory properties
It looks like every branch reintegration to trunk has caused an extra entry to be added in the trunk's svn:mergeinfo property. Is this SVN behavior or TortoiseSVN - and is there anything bad about it? I didn't think SVN used properties as a core…
Mr. Boy
- 60,845
- 93
- 320
- 589