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

SVN Merge from branch to trunk is not working as expected

In order to do some refactoring I copied the trunk in a new branch. Refactoring included renaming Java Source to src and deleting Web Content folder. But after making desired changes in the branch and executing svn merge from the trunk the…
Prince
  • 20,353
  • 6
  • 39
  • 59
0
votes
2 answers

Merge files with SVN

When there are conflicts between the working copy and the repository during updating, I'm using XCode's built in tool FileMerge. How do I save the merged file? What I currently do is save the merged file instead of the original conflicted file. But…
Ilya Suzdalnitski
  • 52,598
  • 51
  • 134
  • 168
0
votes
1 answer

How to invoke a batch script (customize merge) , when svn merge is invoked?

When I try to merge the branch back to the trunk, a batch script must be invoked which runs sonar analysis. If the analysis is successful, only then the merge should proceed further, else it must be aborted. i.e. on clicking merge, an analysis must…
user3214720
  • 1
0
votes
0 answers

SVN merging issue

I have a issue. I am trying to merge a branch back to trunk.The branch has never been merged to trunk.The branch has been renamed couple of times. Now when i merge it stops at a specific revision number (the revision number where the branch was…
Pravin
  • 145
  • 3
  • 9
0
votes
0 answers

Merge developement branch with other branch in tortoise SVN

I am using tortoise SVN and I am working on a separate branch other than development branch. My work on that branch might last more than 2 weeks or so till than if development branch is updated my code will be outdated. I need to keep on updating…
Shehzad Nizamani
  • 2,127
  • 1
  • 13
  • 17
0
votes
0 answers

Interesting "evil-twin" svn merge

Today I encountered a really interesting problem while trying to do a what seemed a simple enough merge. Suppose we have two branches, B1 and B2, where B2 was branched from B1 at some time T1. On each of these branches a new "F" folder was created…
Sterpu Mihai
  • 486
  • 1
  • 4
  • 15
0
votes
1 answer

svn:mergeinfo is not being cherry-picked properly between branches

I created a ^sandbox/feature-branch from ^trunk as a staging area to do a proof of concept. But I don't want to reintegrate merge the feature branch back into ^trunk because of the sandbox in its name. I'd like to create a ^branches/feature-branch…
Michael O'Cleirigh
  • 65
  • 1
  • 7
0
votes
1 answer

How are the sub folder's mergeinfo used when merging at top folder level?

As we know, TortoiseSVN creates svn:mergeinfo as a folder property if the merge is performed at that folder level. This could be a top folder (such as trunk) or some sub folder. I always thought that it was OK to merge at sub folder level since the…
windfly2006
  • 1,703
  • 3
  • 25
  • 48
0
votes
1 answer

How to merge from trunk to branch ignoring all private changes

Trunk svn url: http://svn.myserver.com/trunk/project1 Private branch created from above branch: http://svn.myserver.com/trunk/project1_myprivate Now after some merging from trunk to private and private to trunk, finally I want to merge from trunk to…
coure2011
  • 40,286
  • 83
  • 216
  • 349
0
votes
1 answer

SVN: how to make sure I synced the trunk to a branch correctly

I am using SVN and creating branches for each "meety" feature that I am adding to our website. On a regular basis, I sync the trunk to my branch using this command (from my branch's working directory): svn merge ^/trunk I was wondering if, straight…
Dan
  • 1
0
votes
1 answer

SVN tree conflict issue

I am getting the tree conflict message as mentioned below - 514 (dev) dev:/export/home/user> svn status M . ! C ABC_NY > local delete, incoming edit upon merge Summary of conflicts: Tree conflicts: 1 What I did: Created a…
Shweta Chandrakar
  • 353
  • 2
  • 3
  • 12
0
votes
1 answer

After svn merge, does the previous revision got mixed up

I have questions about the svn merge regarding to the following situation: repo/A is trunk. It has two child branch call repo/B and repo/C let's say originally repo/B has revision 10. repo/C merge foo.c to repo/A, the revision becomes 11. repo/B…
Linghua Jin
  • 570
  • 2
  • 6
  • 22
0
votes
1 answer

SVN Merge new line from trunk to branch conflict

Whilst merging revisions from the trunk to a branch I am looking to achieve the following: Revision 1 (This is also the branch version): First Line Revision 2: First Line Second Line Revision 3: First Line Second Line Third Line By executing the…
GaryDevenay
  • 2,405
  • 2
  • 19
  • 41
0
votes
1 answer

Merging some but not all changes from one SVN branch to another

Since my specific questions just seem to produce UR DOIN IT WRONG, let me lay out the problem and see if someone can suggest a solution. We have a trunkless SVN repository with several ordered branches -- v1, v2, etc. Changes from "lower" branches…
David Moles
  • 48,006
  • 27
  • 136
  • 235
0
votes
2 answers

svn revert after merge

I've done an svn merge between two branches -- not checked in -- and now I want to "un-merge" some of the files in my working copy. Something like the following: svn co svn://myserver/repo/branches/foo@1000 foo cd foo svn merge…
David Moles
  • 48,006
  • 27
  • 136
  • 235
1 2 3 4 5 6
7
8