Stack Overflow
Stack Overflow

Questions tagged [svn-merge]

Questions regarding SVN merge operations.

In the context of the Apache SVN Version Control System, merge is an operation that applies the differences between two sources to a working copy path.

112 questions
2
votes
1 answer

svn mergeinfo - E195016: "must be ancestrally related"

Although there are several similar questions here (e.g., SVN - Reintegration Merge error: "must be ancestrally related") and on the Web, I wasn't able to figure out why svn mergeinfo causes an error in all of my SVN repositories. In contrast…
dokaspar
  • 8,186
  • 14
  • 70
  • 98
2
votes
0 answers

Can I make git-svn aware of an SVN merge?

I use git to work on an existing SVN repository, which has now – conceptually – the following history: A -> B -> C -> D -> E -> F -> G -> H __ \ ➚ trunk ➘ …
leftaroundabout
  • 117,950
  • 5
  • 174
  • 319
2
votes
2 answers

What does this Eclipse icon mean in a Merge Results view?

I just did an svn merge from a branch to a trunk in my Eclipse IDE, and in the Merge Results view, there is this following icon: alt text http://www.freeimagehosting.net/uploads/2a0a0f90b1.jpg I am dying to know what it means. I have searched the…
His
  • 5,891
  • 15
  • 61
  • 82
2
votes
0 answers

TortoiseSVN change automatic merge by extension

I'm looking into creating a tool to diff and merge a file in SVN based on its extension. The files in question are YAML-based, but I don't trust TortoiseSVN to merge them properly, since it has no knowledge of the structure of the file. TortoiseSVN…
limey
  • 21
  • 1
2
votes
3 answers

Best practice to merge / not merge svn tags

I have create a tag named v1.5 off a branch. After some testing I found some bugs and it seems I have to propagate these changes to tag/v1.5. But I see some comments that do not suggest such practice of updating or merging a tag. My question is…
sakhunzai
  • 13,900
  • 23
  • 98
  • 159
2
votes
1 answer

svnmerge croaks on mysterious conflict

We run svn 1.6.x on both server and client. I branched, worked for several weeks, downmerged a few times, and then set out to upmerge back. svnmerge.py, as logged below, splits the commits into two sets, and on the second set, encounters a (false?)…
bmargulies
  • 97,814
  • 39
  • 186
  • 310
2
votes
0 answers

Auditing a `svn merge`?

Something odd just happened. Only half the changes to a file in trunk were applied to tags/version during a svn merge -r 1234:HEAD. I can't figure out how / why. The only way I was able to update the tags/version was to physically copy the…
Jonathan Vanasco
  • 15,111
  • 10
  • 48
  • 72
2
votes
1 answer

Fundamentals of SVN merge

My question relates to some fundamentals of SVN merging mechanism. I am not reporting a merge problem here. Moreover I have gone through SVN book's merge chapter (not a newbie). I have 10 revisions on trunk and I would like to merge revisions…
Ben
  • 179
  • 1
  • 1
  • 6
2
votes
2 answers

SVN - Add code from TRUNK to old branch

I committed files to the trunk. After committing, I realized that those files should also be applied to older branches. Here is the steps I took: My Copy (Using Trunk: Application Version 5) svn commit -m "blah" : revision 123 Old Branch…
teynon
  • 7,540
  • 10
  • 63
  • 106
2
votes
2 answers

svnmerge and renaming a branch break tracking?

If I'm using svnmerge to track changes for a branch and I want to rename the branch (by doing an svn mv), will this cause any problems with the way the changes are tracked? Is this a safe thing to do?
Sydius
  • 13,567
  • 17
  • 59
  • 76
1
vote
2 answers

Araxis merge doesn't show file names when merging

I have svn command-line client integrated with Araxis merge and I want to manually merge even when no conflicts discovered. When I run for example: so in my ~/.subversion/config file I set diff3 external editor: diff3-cmd =…
schatten
  • 1,497
  • 1
  • 12
  • 19
1
vote
1 answer

SVN merge from trunk to branch after trunk directory name has been changed

I have a situation where I branched off trunk and after a number of days of development work in my branch, someone else changed the name of the project directory in trunk. Something like this: from /Project/Directory/trunk/old_dir_name to …
Siege Perl-ous
  • 11
  • 1
1
vote
1 answer

Reintegrating a branch (like svn merge --reintegrate) using svnmerge.py

Since my SVN repository still uses Subversion 1.4, I am using svnmerge.py for merge tracking. I have a feature branch kept in sync with trunk (svnmerge init after branching, then svnmerge merge every now and then). Now I want to reintegrate the…
Danilo Piazzalunga
  • 7,590
  • 5
  • 49
  • 75
1
vote
3 answers

SVN merge renamed projects into trunk

I'm currently trying to merge some changes from a branch back into the trunk, the changes in the branch debrand the name of each project in the trunk. So for simplicities sake lets say the root of the trunk looks like…
Ollie Petch
  • 11
  • 2
1
vote
0 answers

svn merge error "must be ancestrally related" even if files were previously merged

Problem description I have a SVN repository for my scripts. Recently, I've noticed that most of my scripts have a lot of common fragments of code (i.a. parsing options) so I decided to create a simple script that will be used as a template. Then, I…
Piotr Siupa
  • 3,929
  • 2
  • 29
  • 65
1 2
3
4 5 6 7 8