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

SVN strategy using branches, and merging changes from trunk into branch

So long time user of SVN, but fairly inexperienced in branching / tagging, and when I have I suspect I'm not really using it correctly or to its full potential. I have my trunk which I work on adding new features etc. This code base is used in…
Horse
  • 3,023
  • 5
  • 38
  • 65
18
votes
4 answers

Subversion can't merge after a move

I'm very new to Subversion, but I've used other revision control systems like ClearCase for years. My boss asked me to fix this project so that it could be built with Maven instead of Ant. One of the important things I had to do to was to move…
Paul Tomblin
  • 179,021
  • 58
  • 319
  • 408
15
votes
2 answers

SVN: Create a branch from branch and merge to trunk

We have a branch B1, and it is still not stable yet so it is not in trunk. But we want to work with changes from B1 so we create a branch B2 from B1. So svn copy was done as follows svn copy http://svn/trunk http://svn/B1 svn copy http://svn/B1…
Alagu
  • 2,864
  • 3
  • 26
  • 40
12
votes
2 answers

Detecting branch reintegration or merge in pre-commit script

Within a pre-commit script, is it possible (and if so, how) to identify commits stemming from an svn merge? svnlook changed ... shows files that have changed, but does not differentiate between merges and manual edits. Ideally, I would also like to…
Shawn Chin
  • 84,080
  • 19
  • 162
  • 191
12
votes
4 answers

Commits and merges on SVN subdirectories considered harmful?

We have several large subprojects inside our main SVN project root. I commit and merge only my subproject when working with our release branches, mainly because it's faster. However, a colleague pointed out this reference to merging subdirectories…
mskfisher
  • 3,291
  • 4
  • 35
  • 48
12
votes
2 answers

svn merge with --reintegrate complains about missing ranges but mergeinfo seems correct

I have a project with with the following structure ^/project/trunk ^/project/branches/mybranch where current HEAD is revision 1048. The branch was copied from trunk in r523. trunk has been merged to mybranch with the result being r1048. The…
janitor048
  • 2,045
  • 9
  • 23
  • 29
11
votes
1 answer

"The system cannot find the file specified" when invoking subprocess.Popen in python

I'm trying to use svnmerge.py to merge some files. Under the hood it uses python, and when I use it I get an error - "The system cannot find the file specified". Colleagues at work are running the same version of svnmerge.py, and of python (2.5.2,…
Hobo
  • 7,536
  • 5
  • 40
  • 50
8
votes
6 answers

SVN Merge conflict during commit

Eclipse + Subversive plugin On commiting a directory which is out of sync with the SVN a message pops up: Merge conflict during commit svn: Commit failed (details follow): svn: File or directory '.' is out of date; try updating svn: resource out of…
Boris Pavlović
  • 63,078
  • 28
  • 122
  • 148
7
votes
2 answers

Is it possible to replace TortoiseSVN's merge algorithm with a "better" one?

Using the merge functionality in SVN (through TortoiseSVN) since a few month, I have the feeling that SVN reports way too often that a conflict occurs. So I am looking for a way to make (Tortoise)SVN more often resolve conflicts automatically…
Uwe Keim
  • 39,551
  • 56
  • 175
  • 291
6
votes
2 answers

Subversion merge info, how important is it?

I am a bit curious on how the merge info in Subversion is used, and what kind of problems one can run into if the merge info is incorrect? For example, I have branched branch1 and branch2 from trunk. I also have a subbranch1 and a subbranch2…
joscarsson
  • 4,789
  • 4
  • 35
  • 43
6
votes
3 answers

I cannot commit changes after merge in SVN

I had a problem with committing changes after merging two branches of my project using TortoiseSVN. Here are details: I did a merge branch to trunk of project which I am working on. Project includes main repository and libraries joint to main…
Grzegorz Gierlik
  • 11,112
  • 4
  • 47
  • 55
6
votes
1 answer

svnmerge workflow

How are you using svnmerge for merging and branching in svn? Specifically I ask because I have started using svnmerge to track a specific branch in a project I work on. I did svnmerge merge and ended up with lots of strange files like .merge-left,…
Jesper Rønn-Jensen
  • 106,591
  • 44
  • 118
  • 155
6
votes
2 answers

Svn merging and automatically resolving conflicts

I am new to svn and need to do a lot of merging from trunk to a branch we are working from. This is the sequence of svn commmands I take to merge svn up svn mergeinfo --show-revs eligible branch trunk (branch and trunk are actually svn urls) I get…
Decrypter
  • 2,784
  • 12
  • 38
  • 57
5
votes
2 answers

merge 2 svn branches together

I'm working with an svn setup I'm not used to and I need to merge new code from one branch to another. There's no code in the trunk folder so I don't know if I should update the trunk to the code and update the second branch, OR if there is a way…
wajiw
  • 12,239
  • 17
  • 54
  • 73
5
votes
3 answers

Subversive: svn: E195016: Cannot merge into a working copy with a switched subtree

I have an issue with Eclipse and Subversive. I'm trying to reintegrate a branch of a project into the trunk. These are the operations that I'm following: Switch to the trunk version of the project I have ensured that there were no any pending…
Alessandro C
  • 3,310
  • 9
  • 46
  • 82
1
2 3 4 5 6 7 8