Stack Overflow
Stack Overflow

Questions tagged [svn-merge-reintegrate]

19 questions
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
6
votes
2 answers

How to reintegrate a SVN branch into trunk with Netbeans?

I created a branch from trunk. As development on my branch is finished, I want to merge (reintegrate) my branch into trunk. Is there an option or setting to enable? It seems Netbeans 7.1 isn't able to reintegrate a branch into trunk. Am I wrong?
ocornu
  • 579
  • 6
  • 21
5
votes
2 answers

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 reintegration is not working in some cases. It is not…
Halt
  • 2,924
  • 4
  • 22
  • 26
3
votes
2 answers

SVN Merge - Completely "theirs full" - Branch to trunk

I want to merge my branch to trunk and basically want to over-write all the code in branch to the trunk..While receiving conflicts I kept doing "theirs full" for all the conflict; but still at the end it shows so many conflicts. All I want is…
Deepak Singhal
  • 10,568
  • 11
  • 59
  • 98
2
votes
2 answers

Is it safe (with modern Subversion) to "reintegrate" more than once?

If I make a branch 35.1-extra from the 35.1 branch (release branch obviously), do some work, and then after some time merge stuff from 35.1-extra back into 35.1, is it OK to merge more than once? I remember this was problematic in old versions of…
DejanLekic
  • 18,787
  • 4
  • 46
  • 77
1
vote
1 answer

how to do svn reintegration of branches using command line

I have created a new feature branch B from branch A. Now I want to merge back the branch B into A and delete the branch B. But I am getting confused about the two terms Merging the branch Reintegrating the branch I don't understand how this two…
Shankar Naik
  • 401
  • 5
  • 16
1
vote
0 answers

SVN wants to reintegrate on a sync merge

Some time ago a created a feature branch: svn cp ^/trunk ^/branches/feature This was done quite a while ago (almost 2 years). The feature branch was put on hold and I now want to recover it. So the first thing I tried was to sync up the work done in…
Gonçalo Marrafa
  • 2,013
  • 4
  • 27
  • 34
1
vote
1 answer

Branch from branch, reintegrate merge and mergeinfo

I have a branch A started from trunk and a branch B started from A. Periodically, a merge from trunk to A is made and later a merge from A to B is also performed. When I want to merge A and B to trunk, I think to follow this way: reintegrate merge…
Teo
  • 69
  • 2
  • 8
1
vote
1 answer

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. When I commited into the branch, everything is…
Matheus M.
  • 13
  • 3
1
vote
1 answer

Can I reintegrate from working copy?

I have trunk and branch codebases in the repository and locally. Currently I was testing on local branch and when testing was ok I reintegrated branch from repository into local trunk. Now I was told that before reintegrate I need to do synch from…
Radek
  • 13,813
  • 52
  • 161
  • 255
1
vote
1 answer

Is it possible to reintegrate a SVN feature branch into a different release branch?

Let's say I have created a SVN feature branch "Feature123" from a release branch "Version1.0", to work on a new feature. I've made some changes in my feature branch and committed them to the repository, but not yet reintegrated the feature branch…
AndrWeisR
  • 1,110
  • 11
  • 21
0
votes
0 answers

How to merge changes from two branches and test before committing to trunk?

i've got work in two branches and one depends on changes in the other, i.e. I want to test both branches combined before I go ahead and commit trunk to the repository. what I tried is to --reintegrate branch A into branch B (with the intention that…
stdcerr
  • 13,725
  • 25
  • 71
  • 128
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

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

Subversive: how to manage a conflict on the svn:mergeinfo property?

I'm trying to make a merge operation with Subversive in Eclipse. I've been able to manage all the conflicts on the files structure, but it remains a conflict on the svn:mergeinfo property. I've tried everything, but I'm not able to solve this…
Alessandro C
  • 3,310
  • 9
  • 46
  • 82
1
2