Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>So, how are you doing the fix?</p> <h3>Are you fixing it on your feature branch and merging it to trunk?</h3> <p>If so:</p> <p>You can specify specific revisions you want to merge into another branch. For example, if you fixed the bug in revision 1001 on the branch, you want to merge just that revision.</p> <p>You may also need to use the <code>--reintegrate</code> flag. This is used when you merge information back to parent branch. For example, if you branch came from trunk, and you're merging information from the branch back to the trunk, you use the <code>--reintegrate</code> option.</p> <p>If you've already modified the code on trunk, and simply want to record the <em>merge</em>, you can use the <code>--record-only</code> option. This records that the change on the branch was incorporated into the trunk, but doesn't actually perform the merge.</p> <hr> <h3>Or, was there a fix on the trunk, and you want that in your feature branch.</h3> <p>If so, you want to use the normal merge syntax. In fact, you should be <a href="http://www.cmcrossroads.com/bradapp/acme/branching/branch-policy.html#MergeEarlyAndOften" rel="nofollow">merging early and often</a> from the trunk to your branch, so you have the latest code on your feature branch.</p> <p>Again, if you manually applied the patch to your feature branch, do an <code>svn merge</code> but use the <code>--record-only</code> option. This lets Subversion mark the fix as merged into the branch, but doesn't actually preform a merge. This prevents a subsequent merge from trying to <em>fix</em> your fix.</p> <p>The whole purpose of a feature branch isn't to allow you to go off into a cave and program, but to prevent a feature from affecting the build while the feature is in an unstable state. I discourage feature branches. I want developers to be careful and make small changes in order to make sure the build is still good. I also want their development to be visible to the whole team. If you make a branch from trunk, then merge the code back into the trunk, you don't see the history on the branch with <code>svn log</code> unless you also do <code>--use-merge-history</code>, and then the log gets a bit messy.</p> <p>Whenever you create a branch, you end up with merging issues -- especially if the branch is a convergent branch like a feature branch. The developer has to constantly merge the trunk into their branch, and then attempt to merge their work back into the trunk. Although, in theory, the whole merge from branch to trunk should be a simple copy (if the developer has been keeping their branch up to date), we usually end up with a bunch of merge conflicts.</p> <p>The only time I'll okay a feature branch is if the work on it will affect the ability of the code to be built and tested. Even adding a major new feature rarely does this if done carefully (as it should). Feature branching is usually reserved when the code is being refactored or a central part of the foundation of the code is being reworked.</p>
    singulars
    1. This table or related slice is empty.
    1. POsvn: Proper way to fix critical bugs when working in a branch
      singulars
      1. PTQuestion
    1. PTAnswer
    1. This table or related slice is empty.
    1. USDavid W.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POsvn: Proper way to fix critical bugs when working in a branch
      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. VTAcceptedByOriginator
    1. This table or related slice is empty.
 

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