Databases
StackOverflow2013
Postsdbo
POWhat Happens to Commit Logs on a Branch After Merging?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POWhat Happens to Commit Logs on a Branch After Merging?
    primarykey
    data
    text
    <p>Scenario:</p> <ol> <li>Programmer creates a branch for project 'foo' called 'my_foo' at revision 5</li> <li>Programmer makes multiple changes to multiple files as he works on the 'my_foo' feature. </li> <li>At the end of each major step, say adding several new functions to a class, the programmer does an <code>svn commit</code> on the appropriate files therefore committing them to the branch</li> <li>After several weeks and many commits later (each commit having a commit log describing what he did), the programmer merges the branch back into the trunk:</li> </ol> <pre> <code> #Assume the following is being done from inside a working copy of the trunk: svn merge -r 5:15 file:///path/to/repo/branches/my_foo </code> </pre> <p>Hazzah! he's merged all his changes back into trunk! There's much rejoicing and drinking of Mountain Dew.</p> <p>Now let's say another programmer comes along a week later and updates their working copy from revision 5 to revision 15. "Wow", they say. "I wonder what's changed since revision 5". The programmer then does an <code>svn status</code> on their working copy and they get something like this:</p> <pre> ------------------------------------------------------------------------ r15 | programmer1 | 2010-03-20 21:27:04 -0400 (Sat, 20 Mar 2010) | 1 line Merging Version 2.0 Changes into trunk ------------------------------------------------------------------------ r5 | programmer2 | 2010-02-15 10:59:55 -0500 (Mon, 15 Feb 2010) | 1 line Added assets/images/tumblr_icon.png to trunk </pre> <p>What the heck happened to all the notes that the other programmer put in with all of his commits in his branch? Do those not get pulled over during a merge? Am I crazy or just forgetting something?</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USLevi Hackwith
    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. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POWhat Happens to Commit Logs on a Branch After Merging?
      1. USJoanis
      1. VTFavorite
    2. VO
      singulars
      1. POWhat Happens to Commit Logs on a Branch After Merging?
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POWhat Happens to Commit Logs on a Branch After Merging?
      1. This table or related slice is empty.
      1. VTUpMod
    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