Stack Overflow
Stack Overflow

Questions tagged [mergeinfo]

39 questions
2
votes
1 answer

Do I need to keep the svn:merginfo property?

Sorry if this isn't a valid question (I hope I'm right that it is). The project I'm working on, using SVN, is comprised of two "branches". The trunk is where most of the development is done, and there's the "Publish" branch which is where final…
George T
  • 698
  • 9
  • 18
2
votes
2 answers

svn merge from trunk

Sometimes when I merge a project from trunk, some files will appear modified (ie., need to be checked in with the merge) even though there is no difference between my version and the trunk. A compare shows they are exactly the same even white spaces…
treefrog
  • 1,027
  • 1
  • 15
  • 30
2
votes
0 answers

Subversion svn:mergeinfo record in the trunk about itself

I'm looking into a problem we have with a merge and I found something in the recent past that I hope somebody could tell me wether it is a sign of problem or not. I found in the svn:mergeinfo on the ^/trunk itself the following…
Halt
  • 2,924
  • 4
  • 22
  • 26
2
votes
2 answers

How to set a trigger to prevent commits to SVN with mergeinfo property?

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…
ripper234
  • 222,824
  • 274
  • 634
  • 905
2
votes
1 answer

Is the way I'm manually editing mergeinfo safe?

I've done some research on why subdirectory merges are bad and recently discovered a subdirectory in our repository that has mergeinfo on it. I'm trying to remove this merge info manually, and want to see if I'm understanding mergeinfo correctly and…
Kiwi
  • 136
  • 1
  • 8
1
vote
0 answers

How can I ignore irrelevant mergeinfo changes when scanning a log?

Recently my scan for relevant changes has been including mergeinfo changes that are not relevant and I would like to ignore these revisions where the changes in the log item do not alter any items in the folder which I am iterating. I can iterate…
user968245
  • 11
  • 2
1
vote
1 answer

List all revisions that are merge points

I'm looking for a way to get all points at which merges exist from one branch to another. I can see these from eclipse graph tool (want to say subclipse 4.3.0 provides this feature). However, I have yet to figure out a terminal command that can…
DarkGuardsman
  • 126
  • 4
  • 15
1
vote
2 answers

After moving SVN server, TortoiseSVN doesn't save mergeinfo after merge

After moving our SVN server to a completely different machine, at a different path, I just found out that all of our development team cannot merge correctly anymore. Specifically, the problem is somewhat similar to that of this question, however…
Matteo Tassinari
  • 18,121
  • 8
  • 60
  • 81
1
vote
1 answer

How to get SonarQube working with SVN server v1.6.11?

I'm trying to get SonarQube working for my first project and run into this error message now during analysis of C++ code: E200007: Retrieval of mergeinfo unsupported by …
WilliamKF
  • 41,123
  • 68
  • 193
  • 295
1
vote
1 answer

Svn: revert file content changes without reverting any related mergeinfo?

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…
George Hawkins
  • 37,044
  • 7
  • 30
  • 43
1
vote
1 answer

SVN 1.5 Branch Merge with Large Number of Unchanged Files Modified and/or Conflicted

Ive recently begun working on a legacy codebase, in an environment where SVN 1.5.5 is used as the repository. The development team here has had enough difficulties with the mechanics of SVN branching that it has been abandoned. Id like to maintain…
Todd
  • 2,824
  • 2
  • 29
  • 39
1
vote
1 answer

Branch from branch, reintegrate merge and mergeinfo

I have a branch A started from trunk and a branch B started from A. Periodically, a merge from trunk to A is made and later a merge from A to B is also performed. When I want to merge A and B to trunk, I think to follow this way: reintegrate merge…
Teo
  • 69
  • 2
  • 8
1
vote
1 answer

when merging from branch, the directory that I didn't create is shown

I'm working on IntelliJ on window7. merging from the branch on my trunk with 7 files. but like below image, 7 files and 1 directory are displayed on changes. this directory, I didn't create. I think this directory isn't physical directory, it's just…
uuidcode
  • 3,790
  • 3
  • 25
  • 30
0
votes
1 answer

When can I remove entries in svn:mergeinfo?

I've used TortoiseSVN for several years. Several branches were created, merged back to trunk, and then deleted. Example of deleted branches: https://SvnServer/svn/MyProject/branches/branch1 https://SvnServer/svn/MyProject/branches/branch2 …
user790868
  • 1
0
votes
0 answers

SVN mergeinfo command returns revisions from other branches

I am running below command svn mergeinfo --show-revs eligible --log svn:///svn/branches/16.1.3.x svn:///svn/trunk -R -v But, in the output, I am getting revisions from other branches like 16.1.1.x and 16.1.2.x, not a single revision from…
Rahul Techie
  • 363
  • 2
  • 8
1
2
3