Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>The case you demonstrated should generate a normal conflict, it should not result in a tree conflict.</p> <p>I suspect your use case is performing a subtree merge (notice the subtree paths in your svn merge command). All the mergeinfo stuff is only stored in the top level of your checkout </p> <p>From 'svn help merge':</p> <pre><code> SOURCE specifies the branch from where the changes will be pulled, and TARGET_WCPATH specifies a working copy of the target branch to which the changes will be applied. Normally SOURCE and TARGET_WCPATH should each correspond to the root of a branch. (If you want to merge only a subtree, then the subtree path must be included in both SOURCE and TARGET_WCPATH; this is discouraged, to avoid subtree mergeinfo.) </code></pre> <p>The following snippet shows the functionality I believe you are looking for while avoiding the subtree merge. It uses the 'svn switch' to avoid the subtree merge and multiple WCs</p> <pre><code>export SVN_REPO=~/svntest cd $SVN_REPO rm -rf $SVN_REPO/* svnadmin create repo svn mkdir file:///$SVN_REPO/repo/trunk -m "created trunk" svn mkdir file:///$SVN_REPO/repo/branches -m "created branches" # svn checkout file:///$SVN_REPO/repo/trunk wc cd wc echo red &gt; colors svn add colors svn commit . -m 'created trunk/colors with red inside' # svn cp file:///$SVN_REPO/repo/trunk file:///$SVN_REPO/repo/branches/a -m 'created branches/a' # echo green &gt;&gt; colors svn commit . -m 'added green to trunk/colors' # svn switch file:///$SVN_REPO/repo/branches/a . echo blue &gt;&gt; colors svn commit -m 'added blue to branches/a/colors' svn update svn merge file:///$SVN_REPO/repo/trunk </code></pre> <p>Results:</p> <pre><code>Committed revision 1. SVN_REPO/repo/branches -m "created branches" Committed revision 2. SVN_REPO/repo/trunk wc Checked out revision 2. cd wc echo red &gt; colors svn add colors A colors svn commit . -m 'created trunk/colors with red inside' Adding colors Transmitting file data . Committed revision 3. SVN_REPO/repo/branches/a -m 'created branches/a' Committed revision 4. echo green &gt;&gt; colors svn commit . -m 'added green to trunk/colors' Sending colors Transmitting file data . Committed revision 5. SVN_REPO/repo/branches/a . U colors Updated to revision 5. echo blue &gt;&gt; colors svn commit -m 'added blue to branches/a/colors' Sending colors Transmitting file data . Committed revision 6. svn update Updating '.': At revision 6. Conflict discovered in '/home/jbellamy/svntest/wc/colors'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p --- Merging r4 through r6 into '.': C colors --- Recording mergeinfo for merge of r4 through r6 into '.': U . Summary of conflicts: Text conflicts: 1 svn diff Index: . =================================================================== --- . (revision 6) +++ . (working copy) Property changes on: . ___________________________________________________________________ Added: svn:mergeinfo Merged /trunk:r4-6 Index: colors =================================================================== --- colors (revision 6) +++ colors (working copy) @@ -1,2 +1,6 @@ red +&lt;&lt;&lt;&lt;&lt;&lt;&lt; .working blue +======= +green +&gt;&gt;&gt;&gt;&gt;&gt;&gt; .merge-right.r6 </code></pre>
    singulars
    1. This table or related slice is empty.
    1. POsvn tree conflicts: what am i doing wrong?
      singulars
      1. PTQuestion
    1. PTAnswer
    1. This table or related slice is empty.
    1. USJosh
    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. This table or related slice is empty.
    1. COYour `svn cp` command uses two remotes. When I updated my script to use remotes for the copy command it worked as well. Also, my script output specifically shows the merge info being stored to `branches/a`.
      singulars
      1. PO
      1. USaltendky
 

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