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 merging back to Beta1 to test our changes. Should we be using --reintegrate when we merge from the developer branch to Beta1 or just when we finally do Beta1 to trunk?
svn branch to branch merge
306 Views Asked by Bot At
1
There are 1 best solutions below
Related Questions in SVN
- Cannot load modules/mod_dav_svn.so into server
- Created Jenkins pipeline and added the script in the Pipeline Description.To check out the Project from the svn repository.NotWorking. Any Suggestion
- How to host SVN server on Cloud
- In two subversion repositories (same machine), can I have different usernames with no password prompting?
- Unrelated git histories when moving code from SVN to Git
- Convert local SVN to GIT using Tortoise GIT fails with unable connect?
- Jenkins Pipeline Script Check-in SVN using NPM
- Making latest subversion exec point to my restored subversion data directory
- Can anyone help on this "svn merge" problem?
- clone repo from SVN to GIT: unable to connect to a repository
- Possible to recursively serve an existing SVN checkout folder to another computer?
- How to push certain branches into git repository?
- Subversion svn merge failure
- Jenkins: SVN Checkout missing commit message
- SVN same setup, same user, fine from one machine but from another DAV/PROPFIND error
Related Questions in SVN-REINTEGRATE
- Can anyone help on this "svn merge" problem?
- how to do svn reintegration of branches using command line
- SVN wants to reintegrate on a sync merge
- Subversion reintegrate mergeinfo Reverse-merged - how to undo?
- git-svn: Rename branch and use it as new SVN 'trunk' instead of using "merge --reintegrate"?
- How to reintegrate with automatic merge (merge-tracking) in TortoiseSVN 1.8
- How to merge branch back to main branch and avoid tree conflicts - TortoiseSVN
- svn merge vs reintegrate - Example wanted
- SVN - Commit doesn't recognize files inside new folder
- Svn reintegrate a branch in a new trunk-copied-branch
- SVN Code merging between multiple branches problems
- Is it wise to merge changes from head to branch?
- How t reintegarte branch of branch in svn
- svn merge --reintegrate fails on "missing ranges"
- Reintegrating a Branch in Subclipse
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular # Hahtags
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?
When you merge Beta1 to trunk.
The tortoise svn documentation is the 'best' (I use 'best' advisedly) explanation I could find. If you have a branch that has been kept up to date with changes made on trunk, reintegrate is used to merge the branch back to trunk; it does some additional checks to ensure that the branch contains any changes made to trunk since its creation.
In your example, this would mean that if Beta1 contains any changes made to trunk since they diverged, --reintegrate will instruct subversion that it's only merging changes that NEW to the Beta1 branch.