Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>One possible explanation is that you could forget parts of a change set.</p> <p>If the change sets that you are merging cover files that are outside the subdirectory that you have checked out, then there is always the possibility that you will forget to merge those files. </p> <p>For example, if you have a commit like this on trunk:</p> <pre><code>r5 | rich | 2009-04-16 22:22:46 +0200 (Thu, 16 Apr 2009) | 2 lines Changed paths: M /trunk/subdir1/main.c M /trunk/subdir2/main.c Change some stuff </code></pre> <p>And you then have a checkout of subdir1 from your branch "stable", then you could merge the change set r5 like this:</p> <pre><code>$ svn co http://example.com/svn/branches/stable/subdir1 $ cd subdir1 $ svn merge -c 5 http://example.com/svn/trunk/subdir1 . --- Merging r5 into '.': U main.c $ svn ci -m"Merged r5 from trunk" </code></pre> <p>But this will only merge half of revision 5. Worse still, if you go back and look at the log, it will now show this:</p> <pre><code>$ svn log -g http://example.com/svn/ ... ------------------------------------------------------------------------ r5 | rich | 2009-04-16 22:22:46 +0200 (Thu, 16 Apr 2009) | 2 lines Changed paths: M /trunk/subdir1/main.c M /trunk/subdir2/main.c Merged via: r6 Change some stuff </code></pre> <p>So it looks like you've merged the whole commit, when in fact you have only merged some of it. Of course r6 does show that only 1 file has changed on the stable branch.</p> <pre><code>------------------------------------------------------------------------ r6 | rich | 2009-04-16 22:28:16 +0200 (Thu, 16 Apr 2009) | 1 line Changed paths: M /branches/stable/subdir2 M /branches/stable/subdir2/main.c Merge revision 5 from trunk </code></pre> <p>Someone has to remember, or notice, that only part of the change set got merged and the rest needs doing. Not using subdirectory merges avoids this problem.</p> <p>There are times when you really don't want to merge all of a previous commit, and the above scenario is exactly what you intended to do. In that case, it is probably best to add a good commit message describing your intentions.</p>
    singulars
    1. This table or related slice is empty.
    1. POCommits and merges on SVN subdirectories considered harmful?
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USrichq
    1. USrichq
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POCommits and merges on SVN subdirectories considered harmful?
      singulars
      1. PTQuestion
    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. CO+1 - Great answer and example
      singulars
      1. PO
      1. USGary.Ray
 

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