Stack Overflow
Stack Overflow

Questions tagged [svn-reintegrate]

33 questions
49
votes
6 answers

How to Subversion rebase?

I find this way easier to merge branches and less conflicts: Copy trunk to a new branch, merge it with feature branch/s. When things done, merge the new branch back to the trunk. This technique is quite like the mercurial and git rebasing. I used…
bo bo
  • 824
  • 1
  • 8
  • 11
32
votes
5 answers

Missing ranges error message when reintegrating a branch into trunk in Subversion 1.5

I'm trying to reintegrate a development branch into the trunk in my Subversion 1.5 repository. I merged all the changes from the trunk to the development branch prior to this operation. Now when I try to reintegrate the changes from the branch I get…
pako
  • 1,908
  • 4
  • 24
  • 40
22
votes
5 answers

Is it safe to use a subversion feature branch after reintegrate-merged to trunk?

Must a feature branch be deleted after it's merged (reintegrated) back to trunk? I prefer to constantly merge changes back and forth from my feature branch - I believe this keeps the conflicts to a minimum. Yet I understand that once you use the…
ripper234
  • 222,824
  • 274
  • 634
  • 905
18
votes
4 answers

When is the reintegrate option really necessary?

If you always synchronise a feature branch before you merge it back. Why do you really have to use the --reintegrate option? The Subversion book says: When merging your branch back to the trunk, however, the underlying mathematics is quite…
Tor Hovland
  • 1,629
  • 2
  • 15
  • 23
8
votes
2 answers

SVN merge reintegrate missing ranges but nothing to merge

Here is the riddle: C:\code\trunk> svn merge --reintegrate http://svn.e.com/repos/branches/lih --accept postpone --dry-run svn: E195016: Reintegrate can only be used if revisions 11430 through 12384 were previously merged from…
Ryan
  • 22,332
  • 31
  • 176
  • 357
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

Commit local changes after branch was reintegrated

something that shouldn't happen, happened to me today. We were working on a feature branch in svn (Server afaik 1.6, client 1.7). This branch was reintegrated yesterday, while i was not in the office. Now i'm left with some local changes in my…
dowhilefor
  • 10,971
  • 3
  • 28
  • 45
5
votes
1 answer

Reintegrate to the branch (not the trunk) in Subversion (SVN)

I know there is the --reintegrate option in Subversion (SVN) 1.6 to merge a feature branch back to the trunk. My workflow is a little more complex: We have feature branches - we merge trunk to them often. But we don't put them back to trunk right…
tevch
  • 625
  • 6
  • 14
4
votes
1 answer

Why does merging a range of revisions differ from merging them individually?

I've been trying to get my head around SVN merging/reintegrating and have read a these articles/books: http://svnbook.red-bean.com/en/1.5/index.html http://blogs.open.collab.net/svn/2008/07/subversion-merg.html I obviously haven't quite got it, as I…
Paul
  • 328
  • 3
  • 16
3
votes
1 answer

Do I need to reintegrate if I don't merge from trunk in Subversion?

I have read quite a bit about the need to re-integrate when you merge from a branch back to the trunk in SVN (an article about foreign repository merges was really helpful). The problem seems to come from the fact that people are regularly updating…
Matt Austin
  • 219
  • 1
  • 3
  • 13
2
votes
1 answer

svn branch to branch merge

I have a question about when to use --reintegrate. We created a branch called Beta1 that we are using as a temp trunk for now while we try some new changes. Each developer then has a branch that they are making changes in. As necessary we are…
Bot
  • 11,868
  • 11
  • 75
  • 131
2
votes
1 answer

How can I reintegrate an already reintegrated and rolled-back branch in SVN?

We did following ugly thing: So, how can we achieve another reintegrate? What did I try so far? well, the obvious merge - which fails brutally! creating a patch and apply it to trunk (which should work, as it diffs the files with no svn…
user57508
2
votes
2 answers

How t reintegarte branch of branch in svn

I am using SVN. I have a branch created from another branch which in turn created from trunk. Now what is the correct procedure to rentegrate my branch to trunk? -------------------------------------------- trunk \ \________________________…
Abhijeet Pawar
  • 690
  • 6
  • 19
2
votes
1 answer

svn merge --reintegrate fails on "missing ranges"

The situation is like this: A team worked on long-term feature branch (18 months). Periodically merging trunk back to this feature branch (at the beginning every month, later every two/three months). Today we want to merge the feature branch back to…
nav.jdwdw
  • 921
  • 2
  • 9
  • 15
2
votes
1 answer

Reintegrating a Branch in Subclipse

My issue is basically the same as the following question, except I am using subclipse with svn 1.6.17, which was never really answered. Missing ranges error message when reintegrating a branch into trunk in Subversion 1.5 I have merged all my…
Medu
  • 135
  • 2
  • 10
1
2 3