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
0
votes
2 answers

Best practices regarding merging bugfixes from trunk into a feature branch using TortoiseSVN

I have a case where my branch represents a new version which in it there is a refactored data layer, however all of the bug fixes are applied to the trunk. Am I doing something the oppsite way since all of the documentation that I have encountered…
the_drow
  • 18,571
  • 25
  • 126
  • 193
0
votes
1 answer

Subversive: how to manage a conflict on the svn:mergeinfo property?

I'm trying to make a merge operation with Subversive in Eclipse. I've been able to manage all the conflicts on the files structure, but it remains a conflict on the svn:mergeinfo property. I've tried everything, but I'm not able to solve this…
Alessandro C
  • 3,310
  • 9
  • 46
  • 82
0
votes
1 answer

TortoiseSVN "tree conflict" on file when merging

I have a directory in my trunk (trunk/gray/catalog/web/app_code/), and my branch (branches/125/gray/catalog/web/app_code/). The trunk and branch contain 8 files common to both, but the branch has 20 files not found in trunk. These files were SVN…
Developer Webs
  • 983
  • 9
  • 29
0
votes
1 answer

Will a merge always update the revision number of a file?

Lets say that I'm merging a directory from branch-alpha into trunk. There is a new file called phi.txt in branch-alpha that will be merged into trunk. Will the revision of phi.txt change?
Roland
  • 7,525
  • 13
  • 61
  • 124
0
votes
1 answer

What's the difference between svn copy and svn merge for creating a branch?

What's the difference between svn copy and svn merge when creating a branch in SVN?
Naomi
  • 81
  • 1
  • 8
0
votes
1 answer

How to disable the svn-update-automerge for XML files

I have the svn repo with XML files, and I'm not satisfied with svn-update automerge functionality. After svn update or svn update --accept postpone I've got the corrupted XML like this. <<<<<<<…
Y.N
  • 4,989
  • 7
  • 34
  • 61
0
votes
0 answers

Why i am getting Tree conflict here?

Current project structure in SVN Trunk > Folder 1> it contains further folders like A, B,C I have created the branches from Folder 1. Now i realized Folder 1 is redundant.Basically Structure should Trunk > it contains further folders like A,…
emilly
  • 10,060
  • 33
  • 97
  • 172
0
votes
1 answer

Merge with no conflicts, the code doesn't compile: should I fix it before commit?

I'm working with Subversion 1.7.x, and am doing my development on a branch. From time to time I merge from trunk to keep the branch up to date. During the latest merge, though, the incoming code, while totally correct in the trunk, doesn't compile…
watery
  • 5,026
  • 9
  • 52
  • 92
0
votes
1 answer

SVN Merge just revision changes only

Assume I have Revision 101, Revision 102, and Revision 103 for Folder A. I would like to merge Folder A to Folder B with only the changes that where committed in Revision 103 for folder A. I do not want the changes in revision 102. My understanding…
pnizzle
  • 6,243
  • 4
  • 52
  • 81
0
votes
3 answers

svn merge source and target issue

I am using SVN merge (two different trees) to merge trunk to a feature branch. I am selecting source as trunk and target as featurebranch and doing it from a featurebranch local workspace(golden, exact copy what is in SVN). I have a new file…
Narayanan
  • 51
  • 4
0
votes
1 answer

SVN Remote Merging

I currently have a traditional SVN trunk/tags/branches configuration, but only trunk is actually being used. I'd like to add a release location, so I have trunk/tags/branches/release, which I can then track with Jenkins to perform builds. When…
Mark
  • 1,754
  • 3
  • 26
  • 43
0
votes
2 answers

How to merge branch back to main branch and avoid tree conflicts - TortoiseSVN

I have source files managed in SVN using TortoiseSVN. I had added files and committed them to a revision, and subsequently decided to branch. I branched with the files I needed, and performed a delete on the trunk of the files that wasn't intended…
0
votes
0 answers

How to tell if one commit depends on another commit when merging (svn)?

Say I have the following commits on the two branches: (trunk) A - B - C (produ) A I want to merge the work done in C but not necessarily B. There is a chance that the code in C never touched any of the areas changed by B (ideal). But it could…
jmathew
  • 1,522
  • 17
  • 29
0
votes
1 answer

Using svn in xcode5

I am working on project and now one more team member will be working with me on different module. Can any one guide me how to use svn while working in a team? I need to do following things : Create svn repository of my project. Upload my project to…
sam
  • 117
  • 10
0
votes
0 answers

Subversion: Can't merge external folder

I have a folder in my subversion repository that point to an external resource. Updating the folder works fine, but when I try to merge the folder into another folder, I get the following error: svn: E160013: '/pharma/!svn/bc/29/branchtest/shared'…
Dietrich
  • 151
  • 1
  • 6