All Questions
971 questions
0
votes
0
answers
38
views
git svn integrate merge information of svn branches
My goal was to migrate svn to git and keep trunk and some directly diverged branch/A, plus their merge history. Additionally syncing between git and svn was required.
I already managed to create ...
- 581
0
votes
0
answers
20
views
How to merge specific files from the Selected revision in SVN?
I have made changes in DEV env and must merge them with the Production Branch in Tortoise SVN.
I have Selected a revision from the list of revisions. (EX: i.e.. Revision - 2500 - 7 Files Changed)
...
- 719
0
votes
0
answers
29
views
Branching and Merging issues in SVN
We have a Prod, UAT, Emer_Fix branch which are static/permanent - meaning they never close and live forever.
We also have two TEST and a DEV branch which fit this same model.
Current Model:
1 ...
0
votes
1
answer
65
views
SVN merge merging old revisions
Trying to merge trunk into my branch.
mergeinfo in the branch is simply: /root/trunk:37185-37889
No subtree has any mergeinfo.
(This is other information in mergeinfo regarding other branches, which I ...
- 2,316
1
vote
0
answers
129
views
Subversion - why does it try to resolve a tree conflict in a new branch?
I have the following branches setup
\branches
\Foo
\Bar
\trunk
In branches\Foo I have a commit which renames all files (approximatly 3,000 files) with a common prefix for the files. eg. old ...
- 7,450
0
votes
1
answer
63
views
Resolve svn Error: "Can't set properties on 'path/to/somefolder': invalid status for updating properties."
When doing a merge in subversion, I get this error:
Error: Can't set properties on 'path/to/somefolder': invalid status for updating properties.
The merge deletes the folder (it moved it to another ...
- 12k
1
vote
1
answer
108
views
Can anyone help on this "svn merge" problem?
I had this error when doing a command like this from a supercomputer:
svn merge --reintegrate https://vlab.noaa.gov/svn/lamp-oper/lamp/branches/lmp.v2.5.0
The error is this:
Summary of conflicts:
...
0
votes
0
answers
22
views
Subversion svn merge failure
I started a new ipv6 branch about a year ago, committing my work on the branch from time to time. Meanwhile, no changes occurred on the trunk. Finally, after committing the last change in the branch,...
- 1,007
2
votes
1
answer
38
views
SVN changes without merge conflicts
Suppose I have an SVN repository with two branches, and a certain file exists in both branches and differs by one line. Is there a way to allow users to modify that line on either branch and merge to ...
- 825
1
vote
1
answer
73
views
Should I lock all files to avoid merge issue when I using SVN?
I want to use SVN to control my own file(xml and binary files), should I lock all the files to avoid merge issue?
Our team want to use SVN to manage our project files, everyone in our team can edit ...
- 31
1
vote
2
answers
70
views
Tortoise SVN update a branch anfter merging to trunk
Goodmorning,
Two devs, for example Bill and Max, are using tortoise SVN and they have created a trunk for a project (called "prj-trunk"); after that, they made two branch (with branch/tag ...
- 35
1
vote
1
answer
39
views
Guess the first revision to merge when merging up to a revision
I need to automate merging changes up to a specific revision from trunk to a release branch. When you merge up to the head of trunk SVN automatically detects the first revision r2417 :
$ svn merge &...
- 4,200
0
votes
2
answers
34
views
Order of merging in SVN
Suppose that a company supports three versions of their software: 1.0, 2.0 and 3.0, and they have an SVN branch for each version. If a bugfix affects all three versions, they fix it on 1.0, then merge ...
- 825
1
vote
0
answers
16
views
Subversion non transitive merge
I currently struggle with the following scenario:
We do most of our development in trunk
We have separate branches for certain features which are experimental and not production ready yet.
We ...
- 41
0
votes
0
answers
110
views
What is the difference between merging the trunk to a branch vs. a branch to the Trunk?
I am relatively new to using the SVN for version control. I am trying to merge the recent development on my branch to Trunk.
For sake of this example, let us suppose that my branch is at revision ...
- 11