Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>It is never necessary to use <code>--reintegrate</code>; it's a convenience. If your most recent merge from <code>trunk</code> to <code>feature-branch</code> merged all of the changes that occurred in <code>trunk</code> since you branched up to revision <code>rev</code>, then you could use the following command.</p> <pre><code>svn merge url://trunk@rev url://feature-branch . </code></pre> <p>Note that this command would be run in the root of an up-to-date working copy of <code>trunk</code> with no outstanding changes to be committed.</p> <p>Let me expand my answer to more directly answer the question "Is there an example of when dropping reintegrate gives me unnecessary conflicts?"</p> <p>Here's what the article means by "If we include those synched revisions, then we merge back changes that already exist in trunk. This yields unnecessary and confusing conflicts."</p> <p>Including the synched revisions would look like this:</p> <pre><code>svn merge -r N:HEAD url://feature-branch . </code></pre> <p>Where <code>.</code> is a clean working copy of trunk and <code>N</code> is the revision that <code>feature-branch</code> was created from <code>trunk</code>. That merge command merges all of the changes committed to the <code>feature-branch</code> since it was branched, including those changes that were merged from <code>trunk</code> after the <code>feature-branch</code> was created. That means changes already made to <code>trunk</code> would be included in the merge above. You'd be telling Subversion to apply changes to <code>trunk</code> that actually originated in <code>trunk</code>, which results in conflicts.</p>
    singulars
    1. This table or related slice is empty.
    1. POWhen is the reintegrate option really necessary?
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USPeter Mortensen
    1. USMatt Hurne
    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. VTDownMod
    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. COWell, that's what I don't understand. Why would changes that exist in both the branch and trunk lead to conflicts, if those changes are identical?
      singulars
      1. PO
      1. USTor Hovland
    2. CO@Tor, you would see a conflict if you had made any changes in the branch to the modified code. In other words, those changes may no longer be identical. Imagine you added 5 lines on the trunk, synced to the branch, and then modified them on the branch. A merge would then show a conflict: 5 lines on the trunk vs 5 different lines on the branch. But if you used --reintegrate, it would simply notice the difference on the branch and merge that without prompting.
      singulars
      1. PO
      1. USZac Thompson
    3. CODoes this mean that when merging without reintegrate, say "svn merge -r 1:100 url://feature-branch ." will find all changes made to url://feature-branch from rev 1 to rev 100, and apply each of them to . one by one. While with reintegrate, SVN will just compare the difference between rev 100 and rev 1, and treat these difference as changes, then apply to . ?
      singulars
      1. PO
      1. USCarmeloS
 

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