Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>It is no longer in TortoiseSVN because Subversion 1.8 deprecated the --reintegrate option. Subversion 1.8 has automatic reintegration handling/detection. </p> <p>See: <a href="http://subversion.apache.org/docs/release-notes/1.8.html">Subversion 1.8 release notes</a>, specifically <a href="http://subversion.apache.org/docs/release-notes/1.8.html#auto-reintegrate">the auto-reintegrate section</a></p> <p>Here is the relevant area, for convenience:</p> <blockquote> <p><strong>Automatic reintegration merge (--reintegrate option deprecated)</strong></p> <p>During merges which merge all eligible revisions from another branch, Subversion 1.8 will automatically decide whether or not the merge is reintegrating a branch. Therefore, reintegrating a branch does no longer require the --reintegrate option for correct operation.</p> <p>The --reintegrate option of svn merge is now deprecated and its use is discouraged. To reintegrate a branch, have a clean working copy of trunk and run the following command in its top-level directory:</p> <pre><code>$ svn merge ^/branches/my-branch </code></pre> <p>This merge will still perform similar sanity checks which svn merge --reintegrate performed in earlier releases:</p> <ul> <li>The working copy must not be a mixed-revision working copy.</li> <li>The working copy must not have switched subtrees.</li> <li>There must be no gaps in revision ranges merged from the reintegration target (e.g. the trunk) to the reintegration source<br> (i.e. the branch to be reintegrated).</li> </ul> <p>If any of these conditions are detected, the merge is aborted and the necessary steps must be taken to fix the problem before the branch can be reintegrated. In contrast to a --reintegrate merge, an automatic reintegration merge into a working copy with local modifications is allowed.</p> <p>Merging to-and-fro between two branches in any order is possible using the automatic reintegration merge (the "keep-alive dance" is no longer necessary). For best results, it is recommended to always merge all eligible revisions, i.e. not using the -r or -c options of svn merge. Merging just a subset of eligible revisions increases the likelihood of problems during future merges.</p> <p>Using --reintegrate in Subversion 1.8 will force a reintegration merge, whether or not that's the right merge to perform in the given situation.</p> </blockquote> <p><strong>In your case, you should do the following</strong>:</p> <ol> <li>Make sure you're using a clean, no modifications, up-to-date trunk working copy as you normally would</li> <li>TortoiseSVN -> Merge on this working copy root</li> <li>Select "Merge a range of revisions"</li> <li>Select the branch you are reintegrating</li> <li>Do not specify a revision range (to merge all eligible revisions)</li> <li>Subversion 1.8 should autodetect the reintegration and perform the same safety checks</li> <li>Proceed with your merge normally</li> </ol> <p>According to the compatibility table, a Subversion 1.8 client can perform this auto-reintegrate as long as your Subversion server and repository format are each version 1.5 or later. </p> <p>I haven't done an auto-reintegrate yet myself, I'm just going off the release notes.</p>
    singulars
    1. This table or related slice is empty.
    1. POTortoisesvn Subversion 1.8 - merge - no more reintegrate a branch option
      singulars
      1. PTQuestion
    1. PTAnswer
    1. This table or related slice is empty.
    1. USJoshua McKinnon
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COThis answer is better because of "Do not specify a revision range (to merge all eligible revisions)"
      singulars
      1. PO
      1. USoldwizard
    2. COThanks for the helpful explanation. I have noticed that in SVN 1.7 merge tracking also works perfectly and I don't see the need to use reintegrate there either. Is it possible to just reintegrate using a normal merge in 1.7 too?
      singulars
      1. PO
      1. USFletch
    3. CO@Fletch I have always referenced [this post](http://blogs.collab.net/subversion/subversion-merg) on the collab.net blog regarding merge reintegration since 1.5. I still use it for branch reintegrations in 1.7 - it basically does a lot of extra safety checks and it HAS found potential issues for me in the past (1.7). Looking closer at the release docs, I think the suggestion would be to upgrade your client to 1.8 (server version only needs to be 1.5+) since auto merge reintegration is a CLIENT-side operation and then you could definitely not worry about it.
      singulars
      1. PO
      1. USJoshua McKinnon
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload