113 questions
0
votes
1
answer
58
views
Update a merged but not committed svn branch
I have a svn branch, say feature, created from trunk. I am ready to merge my feature branch into trunk, so I did this:
cd trunk/
svn merge <path/to/feature/branch>
After doing this, I am not ...
- 2,824
0
votes
1
answer
211
views
svn merge xml based file
We are facing a problem in the code merge and un-merge, Please advice : Problem statement is below:
We are using SVN as SCM, We have a trunk, from trunk we have created the a Branch B1 for the ...
- 1
0
votes
1
answer
86
views
SVN Mergeinfo stored on WC or on Server
Kindly clarify my questions. I ask these question because I'd like to understand the reason for 'missing mergeinfo'
1) Is svn:mergeinfo stored on 'SVN Host Server' or on 'Working copy'?
2) If ...
- 2,662
0
votes
1
answer
428
views
SVN merge svn:externals from trunk to branch
We merge changes from time to time from trunk to our current branches. We use SVN 1.7.6 and tried it with SmartSVN and Tortoise SVN.
It does not work to merge the changes made in the svn:externals ...
- 509
0
votes
1
answer
175
views
svn merge with renamed directory in branch
We have a recent requirement at my workplace wherein we have a baseline Android project (trunk). Other projects will need to (svn) branch out from this baseline Android project and start their own ...
- 7,126
0
votes
1
answer
416
views
Problems in Tortoise SVN Merging between Trunk and branch
I am new to Tortoise SVN and i have the following 2 doubts
i)When i checkout Trunk Project from Repository,Head Revision is 181 ,whereas when i checkout ,it says Workingcopy revision as 204(yes it ...
- 503
2
votes
1
answer
2k
views
svn mergeinfo - E195016: "must be ancestrally related"
Although there are several similar questions here (e.g., SVN - Reintegration Merge error: "must be ancestrally related") and on the Web, I wasn't able to figure out why svn mergeinfo <file> ...
- 8,724
5
votes
3
answers
14k
views
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 ...
- 3,640
0
votes
1
answer
222
views
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?
- 7,955
0
votes
1
answer
314
views
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?
- 79
0
votes
1
answer
555
views
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.
<?xml ...
- 5,347
0
votes
1
answer
202
views
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, ...
- 5,557
0
votes
3
answers
2k
views
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, ...
- 61
4
votes
1
answer
4k
views
SVN Merging and tree conflicts "local add, incoming add upon merge"
I'm trying to follow the release branching model described at http://svnbook.red-bean.com/en/1.7/svn.branchmerge.commonpatterns.html, but on attempting to do the merge I get a merge conflict.
# ...
- 1,862
0
votes
2
answers
2k
views
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 ...
- 13
0
votes
1
answer
39
views
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 ...
- 117
2
votes
0
answers
146
views
TortoiseSVN change automatic merge by extension
I'm looking into creating a tool to diff and merge a file in SVN based on its extension. The files in question are YAML-based, but I don't trust TortoiseSVN to merge them properly, since it has no ...
- 21
5
votes
2
answers
3k
views
SVN 1.8 merge (branch reuse) seems broken when having local mergeinfo
We have a problem with the new 1.8 subversion clients (we use TortoiseSVN 1.8.5 & SlikSVN 1.8.5). It seems that the new SVN 1.8 feature of being able to keep using your feature branch after ...
- 2,994
0
votes
1
answer
443
views
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 ...
0
votes
0
answers
260
views
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 ...
- 141
1
vote
1
answer
588
views
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. ...
- 13
0
votes
0
answers
337
views
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 ...
- 688
0
votes
1
answer
2k
views
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 ...
- 1,715
5
votes
2
answers
11k
views
Undo an undesired merge in SVN
We have a repository running SVN. At some moment, to add a feature (lets call it 'branch'), we created a development branch from the main trunk (let's call it 'trunk').
We kept doing our work and ...
- 330
0
votes
1
answer
98
views
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 ...
