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
5
votes
1 answer

Excluding files on a branch merge with subversion

I have created a feature branch off of the trunk for my project and the feature branch requires some project file configuration changes for it to work. When I merge the feature back to the trunk I don't want the project file merged. Is there any way…
Richard Edwards
  • 1,379
  • 1
  • 17
  • 30
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
1 answer

Tortoise SVN Merge "@### must be ancestrally related to @###" Error

Backstory: Got a job as an entry level web developer. Head developer leaves right when I start. All responsibility on me. Never used SVN. Going in blind. Problem: I keep getting errors like 'svn://svn/svn/xxx/project_name/branches/dev@330' must…
mandelbug
  • 1,548
  • 5
  • 20
  • 32
5
votes
2 answers

Undo an undesired merge in SVN

We have a repository running SVN. At some moment, to add a feature (lets call it 'branch'), we created a development branch from the main trunk (let's call it 'trunk'). We kept doing our work and commiting to the branch, occasionally, we merged…
Pedro Perez
  • 330
  • 1
  • 2
  • 11
5
votes
2 answers

SVN merge from trunk to branch results in tree conflicts

Assuming we have one trunk and one branch (COKE). (I run Git over SVN and merge from trunk to COKE with svn, not Git) There have been changes in FILE1 on trunk that we want in COKE branch. We merge from trunk and I commits the merge on COKE…
user1643192
  • 51
  • 3
4
votes
1 answer

SVN Merging and tree conflicts "local add, incoming add upon merge"

I'm trying to follow the release branching model described at http://svnbook.red-bean.com/en/1.7/svn.branchmerge.commonpatterns.html, but on attempting to do the merge I get a merge conflict. # Normal SVN Structure svn-testing2> ls -l total…
Mark
  • 1,754
  • 3
  • 26
  • 43
4
votes
1 answer

Versioned items causing obstructions in SVN

I'm using the VisualSVN server, with TortoiseSVN and AnkhSVN in Visual Studio. I have a Trunk to which some devs on other teams are commiting various small changes on a regular basis. I have a Branch on which a fairly major new development is being…
AnthonyWJones
  • 187,081
  • 35
  • 232
  • 306
4
votes
1 answer

How should one use the svnmerge workflow with Mercurial?

svnmerge helps to block some changesets from a specific branch. How can this be achieved with Mercurial?
user134843
  • 133
  • 1
  • 5
3
votes
1 answer

svn merge with svn:externals causes massive add of svn:merge-info properties - any solution?

If you have a directory with an svn:external link it in (which we use extensively at work), then whenever you merge that directory between branches, every file in the directory gets a new svn:merge-info property. I'm guessing it's because the…
Malcolm
  • 1,239
  • 1
  • 14
  • 25
3
votes
2 answers

SVN Merge - Completely "theirs full" - Branch to trunk

I want to merge my branch to trunk and basically want to over-write all the code in branch to the trunk..While receiving conflicts I kept doing "theirs full" for all the conflict; but still at the end it shows so many conflicts. All I want is…
Deepak Singhal
  • 10,568
  • 11
  • 59
  • 98
3
votes
4 answers

Subversion merge local changes trunk to branch

In my local Subversion working copy, I have a copy of trunk and of a code branch. I've made changes in the trunk, and want to copy these changes to my (currently clean) local copy of the branch. I know I can check in the code to trunk, then use svn…
me_and
  • 15,158
  • 7
  • 59
  • 96
3
votes
2 answers

How can I merge my files when the folder structure has changed

I want to perform a major codebase reorganization, but I'm unable to proceed unless I can provide a way for trunk fixes to be easily applied to branches that were taken before the reorganization. One approach I was considering was to apply the…
tomdee
  • 2,319
  • 5
  • 25
  • 39
3
votes
2 answers

svnmerge vs svn merge

What is the difference between 'svnmerge' (alias svnmerge.py, the python script that comes with svn) and 'svn merge' (Subversion 1.5's native merge-tracking)? Which one do you recommend?
Angel
  • 401
  • 1
  • 4
  • 11
2
votes
1 answer

SVN Netbeans - Resolve conflicts - keep both versions

I'm using SVN with latest Netbeans. Is it possible to keep both changes when resolving a conflicts? Using netbeans or svn command line? I have 2 branches, both have file main.java. One developer adds there function funA() in branch 1 and other adds…
karolkpl
  • 2,189
  • 10
  • 39
  • 60
2
votes
1 answer

Why SVN does not merge trunk when trunk subdirs have been merged?

I am facing a really annoying issue with SVN merge. I want to merge the trunk into a branch. Usually, it is rather simple, but this time, due to heavy changes, I had to process step-by-step and SVN does not seem to appreciate that. Lets say I…
rockeye
  • 2,765
  • 2
  • 30
  • 44
1
2
3 4 5 6 7 8