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

merge specific revisions only with svn from command line

How can I merge in a list of changes I have committed to the trunk to my branch? The list of revision are all of my changes and these are the only revisions I wish to merge to the branch (.) I have tried this, but to no avail. svn merge …
crmpicco
  • 16,605
  • 26
  • 134
  • 210
0
votes
2 answers

Subversion merge behavior

I have created a quick example to demonstrate my question. From the log below you will see following: r1 - created trunk r2 - created branches r3 - added foo.txt into trunk r4 - created QA branch r5 - created UK branch r6 - created TEAM branch r7 -…
anazimok
  • 1,750
  • 2
  • 20
  • 33
0
votes
2 answers

SVN Add file every commit or merge, even if not changed

Can I force SVN to commit/merge a specific file every time even if the file doesn't change? I know you can ignore a file but what about something like 'Always Commit' option? I'm using the revision number SVN Tags $Revision$ in one file, I parse the…
Phill Pafford
  • 83,471
  • 91
  • 263
  • 383
0
votes
2 answers

How to import and merge 2 directories with SmartSVN?

I have such situation: We have a website which code is not hosted on SVN. I made changes in this website. Freelancer hired by client (not our team member) made changes in parallel; we have not possibility to collaborate. So, we have 2 folders on…
Vitalii
  • 4,434
  • 4
  • 35
  • 77
0
votes
1 answer

Complex subversion 1.4 merge

I've had a long-running feature branch that needs to be merged back into the trunk. But I'm having a heck of a time getting the incantation right, and I could use a little help. the log from my feature branch looks like this (I'm simplifying to…
Chris Curvey
  • 9,738
  • 10
  • 48
  • 70
0
votes
1 answer

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 After doing this, I am not ready to commit/push the changes to trunk yet. BUT I want…
Rahul Bharadwaj
  • 2,555
  • 2
  • 18
  • 29
0
votes
1 answer

TortoiseSVN moving a branch to trunk

I messed up and did the main development on a branch, the trunk is actually empty in the repository and I'm trying to move the branch to the trunk. I'm not sure how this is supposed to be done the right way and it gets more complicated because in my…
Max Kielland
  • 5,627
  • 9
  • 60
  • 95
0
votes
1 answer

Is there a way to tell when reintegrate option used with svn merge?

Is there a way in Subversion 1.6, using logs, mergeinfo, etc., to determine when a merge was done with the --reintegrate option? (This presumes one knows which commits are the results of merges.)
nshew13
  • 3,052
  • 5
  • 25
  • 39
0
votes
1 answer

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 development, We have multiple projects going on the same…
Bhanu
  • 1
0
votes
1 answer

SVN merge with multiple revisions [Not Range]

I am trying to merge some specific revisions of a source branch to destination branch. Using Python script. When I use svn merge --dry-run range of revisions works fine. -r 72338:HEAD Single revision works fine -c 72338. If I use multiple revisions…
Bromount
  • 1
  • 2
0
votes
1 answer

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 svn:mergeinfo is stored on 'Serverside' is there…
Sathish Kumar
  • 2,150
  • 10
  • 29
  • 51
0
votes
1 answer

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 property (new externals, raised fixed revisions of…
Creepin
  • 482
  • 4
  • 20
0
votes
1 answer

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 line of development. Now let's say that the current…
user1506104
  • 6,554
  • 4
  • 71
  • 89
0
votes
1 answer

How to remove lingering svn:mergeinfo properties on reintegrate?

I wanted to work on a small set of changes independent from my other development on a project. I've been using this as a guide. I started off by doing a svn cp from /trunk/app/module to /branches/pete/feature-branch, this was r393 After some…
Pete
  • 1,305
  • 1
  • 12
  • 36
0
votes
1 answer

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 shows a Different revision) when i see Properties I…
Vijay Manohar
  • 473
  • 1
  • 7
  • 22
1 2 3 4
5
6 7 8