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
1
vote
1 answer

What's the meaning of the two file status after svn merge?

In my trunk working copy, I run svn merge -r 41324:41557 branch_url, and getting the following output: --- Merging r41325 through r41557 into '.': U KfClient\ctimclientapp.cpp U KfClient\util\utility.cpp C…
waterd
  • 603
  • 1
  • 7
  • 23
1
vote
1 answer

TortoiseSVN: Merging two ancestrally unrelated branches

I am trying to merge a branch into the trunk. They have no common ancestor. The branch was created sometime in the past with a simple Ctrl+C and Ctrl+V of the trunk, a practice which, of course, "broke" any future merge operation between the two, as…
charistas
  • 17
  • 1
  • 2
1
vote
2 answers

If you merge a specific set of revisions from trunk into a branch with subversion, what happens?

If I make changes in the trunk to 3 different files, say revisions 40, 45, and 47 respectively, where none of those files have changed since revision 15, how can I merge those revisions into the branch (made at revision 30 and unchanged since) so…
cdeszaq
  • 30,869
  • 25
  • 117
  • 173
1
vote
1 answer

Can Subversion record a merge without mergeinfo?

I'm searching through a particularly gnarly set of older revisions in one of our repositories, trying to figure out what happened with a couple of supposed merges. When I look at one of the revisions in the target branch, it shows me content that's…
Anthony Mastrean
  • 21,850
  • 21
  • 110
  • 188
1
vote
1 answer

svn merge - moved repository to a different server, and now getting 'has different repository root' messages

This is kind of similar to subversion merge - "has different repository root than" - but appears to be a very different cause (especially as the answer for that question didn't resolve my problem). A while back, we swapped out the server where our…
HorusKol
  • 8,375
  • 10
  • 51
  • 92
1
vote
1 answer

SVN - Commit doesn't recognize files inside new folder

Environment: OS: Linux Mint 14 SVN: 1.8.3 This issue occurs under command line and subclipse plugin. I create a new java package under an existing project, and adding many classes in this package. When I commited into the branch, everything is…
1
vote
2 answers

Does SVN Merge Save Disk Space?

The SVN book describes deltification as "each time a new version of a file is committed to the repository, Subversion encodes the previous version (actually, several previous versions) as a delta against the new version." This collab.net blog…
Knobbywheels
  • 213
  • 1
  • 2
  • 6
1
vote
1 answer

Merging svn externals causes lots of problems

I created a branch from the trunk and worked on the branch. I then merged changes from the trunk to the branch and then merged from branch back to trunk. All this worked as it always does. The problem is that the solution contains an external and…
Sachin Kainth
  • 45,256
  • 81
  • 201
  • 304
1
vote
1 answer

Mercurial equivalent of svn's merge --record-only?

We've recently moved our codebase from subversion to mercurial, and are doing our first release to production from the mercurial codebase this weekend. We have a three repo setup, let's call them dev, stable and release, where dev is a clone of…
rjohnston
  • 7,153
  • 8
  • 30
  • 37
1
vote
1 answer

Is it possible to reintegrate a SVN feature branch into a different release branch?

Let's say I have created a SVN feature branch "Feature123" from a release branch "Version1.0", to work on a new feature. I've made some changes in my feature branch and committed them to the repository, but not yet reintegrated the feature branch…
AndrWeisR
  • 1,110
  • 11
  • 21
1
vote
0 answers

Blocking changes to properties/externals when merging in SVN

I have an environment set up where my externals point to a different location in every branch. When I merge my code from one branch to another, I always wind up with a merge conflict in the project properties that has to be manually resolved. …
1
vote
1 answer

SVN Merge - Client or Server?

When 2 users change the same file (in the same branch) and check their code into SVN, SVN will (after asking the second user to do an update) auto merge the files and try to resolve any conflicts. Does this merge process happen on the client or on…
Alasdair McLeay
  • 2,572
  • 4
  • 27
  • 50
1
vote
3 answers

svn merge : Tree conflict weird

I am getting Tree conflict in SVN. It's weird! I have standard Trunk, Branches, Tags structure, and follow multiple team model. Branch1, Branch2 are created form Trunk and active parallely Steps followed: 1. Branch1 Work: newfile.c added and…
rohit
  • 485
  • 1
  • 7
  • 12
1
vote
0 answers

SVN MERGE: Non-ancestrally Branch to Trunk

I want to merge a branch which is just committed to the branch folder (was not actually branched) to the trunk. Here is the detail. repo/ /trunk /mymagento // at rivision 500 /branch /magento /magento1.6 …
SAM
  • 641
  • 2
  • 16
  • 30
1
vote
0 answers

subversion: Is it correct to use svn merge command(with rev B) on already merged code(for rev A)

I've merged my code with a branch for revision(say X), now there have been commits in the other branch and i want to take those changes in the merged code(which is not committed yet). Now can i run the svn merge command(to say revsion Y) on already…
Sheetal T
  • 90
  • 1
  • 7