Stack Overflow
Stack Overflow

Questions tagged [svn-reintegrate]

33 questions
1
vote
2 answers

Problems with reintegrate branch to trunk in SVN

I'm trying reintegrate branch to trunk, but when i click "Test merge" in the TortoiseSVN, I get this message: Command: Reintegrate merge https://127.0.0.1/svn/global/branches/somebranch into D:\wwwroot\work Error: Reintegrate can only be used if…
user658599
1
vote
1 answer

Reintegrating a branch (like svn merge --reintegrate) using svnmerge.py

Since my SVN repository still uses Subversion 1.4, I am using svnmerge.py for merge tracking. I have a feature branch kept in sync with trunk (svnmerge init after branching, then svnmerge merge every now and then). Now I want to reintegrate the…
Danilo Piazzalunga
  • 7,590
  • 5
  • 49
  • 75
1
vote
1 answer

How to exclude specified files from SVN reintegrate branch?

I have 2 branches what I'm reintegrating In both branches I have same CFG files what I dont want to be reconciled. Wanted keep them versioned but not reconciled. Do you know any way how to exclude specified files from this process?
Maciej
  • 10,423
  • 17
  • 64
  • 97
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

How are deleted and renamed/moved files handled when merging a feature branch with trunk and reintegrating it back to the trunk in Subversion?

I've got a big-ish project that needs a lot of work on a new feature, so I planned on using a branch to do this work. I haven't had to do this before, and I just wanted to get assurance from an experienced Subversion user that things "should" work…
Michael Repucci
  • 1,633
  • 2
  • 19
  • 35
1
vote
1 answer

How to reintegrate with automatic merge (merge-tracking) in TortoiseSVN 1.8

I've read both these release notes for SVN 1.8 and this question concerning reintegration of a branch with SVN 1.8. My questions, which I couldn't find an answer to, is the following: Is there any difference between choosing all revisions specific…
Joerg
  • 790
  • 2
  • 10
  • 23
1
vote
1 answer

svn merge vs reintegrate - Example wanted

After some reading with the intention to understand what is really svn reintegrate. Can someone give an Example of: svn merge of a branch to trunk and svn merge --reintegrate of a branch to trunk Which give different results ?
barak
  • 869
  • 1
  • 11
  • 15
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
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

Subversion reintegrate mergeinfo Reverse-merged - how to undo?

Hi We use 1.6 SVN client. We have 3 branches - trunk, branch A (created from trunk), branch B (created from A). Revision r1 of trunk is blocked (using --record-only) in branch A with corresponding revision r2. Revision r2 of A is then…
chz
  • 355
  • 1
  • 7
  • 21
0
votes
1 answer

git-svn: Rename branch and use it as new SVN 'trunk' instead of using "merge --reintegrate"?

I have a Ruby on Rails project that I am working on which uses SVN (1.6.17, Debian) for version control. Locally I am using Git (2.5.4, OS X) with git-svn and I have been working on a branch (called "ruby22rails42") for a major update to the project…
Jens
  • 1,386
  • 14
  • 31
0
votes
2 answers

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 on the trunk of the files that wasn't intended…
SierraTango
  • 13
  • 5
0
votes
1 answer

SVN Code merging between multiple branches problems

We use SVN 1.6 We like to perform code merging between branches and we are in a dilemma situation. Branch A exists Folks making code changes on Branch A Branch B created from branch A Folks making code changes on both branches A and B …
chz
  • 355
  • 1
  • 7
  • 21
0
votes
1 answer

Is it wise to merge changes from head to branch?

We decided to make a branch for some feature so we dont affect the head, now the question is it a good idea to keep merging changes from the trunc in our branch? would this meake the reintegrate easier at the end?
CloudyMarble
  • 36,908
  • 70
  • 97
  • 130
1
2
3