Databases
StackOverflow2013
Postsdbo
POgit-svn workflow for merging using svn.pushmergeinfo
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POgit-svn workflow for merging using svn.pushmergeinfo
    primarykey
    data
    text
    <p>What is the correct workflow for merging svn tracked branches using git-svn. I've read a little about the git-svn svn.pushmergeinfo config key, and the caveats are:</p> <p>From <a href="http://www.kernel.org/pub/software/scm/git/docs/git-svn.html" rel="nofollow">http://www.kernel.org/pub/software/scm/git/docs/git-svn.html</a>:</p> <blockquote> <p>config key: svn.pushmergeinfo </p> <p>This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN.</p> </blockquote> <p>So my normal workflow is:</p> <p>Assuming I have an SVN branch ^/branches/feature_branch</p> <pre><code># Ensure git-svn is configured to populate svn:mergeinfo git config --global svn.pushmergeinfo true # Update my local svn remotes state git svn fetch # Track a local branch against a remote SVN backed ^/branches/feature_branch git checkout -b local_feature_branch remotes/feature_branch # Modify files and commit to local git repo git commit -a -m "changes" # Push changes to SVN branch ^/branches/feature_branch git svn dcommit </code></pre> <p>Then to merge up ^/trunk into my local_feature_branch I assume I do something like?</p> <pre><code># Sync to the latest SVN git svn fetch # Rebase "master" which is tracking the remote SVN ^/trunk git checkout master git svn rebase # Checkout the local_feature_branch git checkout local_feature_branch # Merge "master" into "local_feature" which is tracking ^/trunk git merge --squash master git commit -m "merge master which is tracking SVN ^/trunk" # Dry run the dcommit to SVN which should include svn:mergeinfo property changes git svn dcommit --dry-run # Commit merge to trunk git svn dcommit </code></pre>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USDavid Gardiner
    1. USDougnukem
    plurals
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POgit-svn workflow for merging using svn.pushmergeinfo
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POgit-svn workflow for merging using svn.pushmergeinfo
      1. USMatt McHenry
      1. VTFavorite
    3. VO
      singulars
      1. POgit-svn workflow for merging using svn.pushmergeinfo
      1. This table or related slice is empty.
      1. VTUpMod
    1. COLooks reasonable. What's the question about?
      singulars
      1. POgit-svn workflow for merging using svn.pushmergeinfo
      1. USDmitry Pavlenko
 

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