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.
Questions tagged [svn-merge]
112 questions
0
votes
1 answer
svn diff: getting 'real' diffs for removed/readded files after merge
So I have two branches, b1 and b2. I have a working copy of b1 checked out at a certain revision, r1000, and I've merged in some changes from r1001 of b2.
I've manually edited a file foo, in my working copy, such that it's now identical to the r1000…
David Moles
- 48,006
- 27
- 136
- 235
0
votes
1 answer
Safe to merge branch that other branch is branched from to trunk?
We have a standard layout with
tags
branches
trunk
But no code is present in trunk. Trunk has never been used. Instead all work has been done in a branch and once that branch has been considered done a new branch has been created. From now on all…
inquam
- 12,664
- 15
- 61
- 101
0
votes
0 answers
SVN merge issue
I am trying to do svn merge from some branch to my local workspace.
When I try to do merge, it takes lot of time and stops abruptly.
Second time, I opened windows task manager and started the merge procedure again. I find that, fewminute after…
rohit
- 485
- 1
- 7
- 12
0
votes
1 answer
svn - review updates to "branch updated" files after merge?
I'm working on a feature branch in SVN and I'm trying to frequently bring in changes from the trunk so I don't get too out-of-date.
I've been using the command: svn merge ^/parent/branch/path
How do I get a clear list of the files that are…
nonot1
- 2,788
- 4
- 25
- 41
0
votes
1 answer
How do I merge PART of a file in SVN?
Say I have made multiple changes to a file, but I only wish to commit a few of those changes back to trunk, i.e. lines 10-20 need committing but nothing else, is there a way to do this in SVN? Ideally using Tortoise SVN.
I'm not working on a branch,…
chrisvarnz
- 439
- 7
- 17
0
votes
2 answers
Svnmerge and a file replaced with a directory
I'm using svnmerge.py to manage our repository. In trunk, file X has been replaced a directory. When trying to merge this to a branch, I get the error:
svn: Can't replace 'X' with a node of a differing type; the deletion must be committed and the…
Paul Biggar
- 27,579
- 21
- 99
- 152
-1
votes
1 answer
Accidentally deleted folder of 3000 files in SVN trunk
we currently are using SVN and a developer accidentally deleted a folder of 3000 files and then added them back in fresh and committed. Then that branch was reintegrated into trunk. So now our SVN trunk has a history that shows a folder being…
Scoota P
- 2,622
- 7
- 29
- 45