Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>Using <em>merge --squash</em> and <em>svn.pushmergeinfo</em> together doesn't make much sense. With merge --squash, the resulting commit won't be a merge commit, so a subsequent <em>dcommit</em> won't create any mergeinfo.</p> <p>I know that (mostly older) threads here on stackoverflow suggest using --squash, but I think that's largely a relic of the past. I have been using git-svn to manage our company's svn repos for close to a year now, and so far it worked great with the following workflow:</p> <p>I always make sure before a merge that I am up-to-date and, just to be safe, that I don't have any local unsynced commits:</p> <pre><code># On local_feature_branch # Update from SVN git svn fetch &amp;&amp; git svn rebase -l # push pending commits git svn dcommit </code></pre> <p>Then I do a 'real' merge, using the "remote" SVN branch as source. This saves switching branches and updating, and ensures that the incoming branch doesn't have any local unsynced commits:</p> <pre><code># Create a real, non-forward merge commit git merge --no-ff svn/trunk # ... and push it to SVN, including mergeinfo git svn dcommit </code></pre> <p>Also, this way the merge gets properly recorded in the local history, so subsequent merges won't have to deal with previously resolved conflicts. With --squash you'd reencounter those with every merge.</p> <p>Note however that there is an open issue with mergeinfo when merging back from local_feature_branch to trunk (i.e. a reintegrate in svn-speak): <a href="https://stackoverflow.com/questions/9700998/git-svn-with-svn-pushmergeinfo-how-to-avoid-self-referencing-mergeinfo-lines">Git-SVN with svn.pushmergeinfo: how to avoid self-referencing mergeinfo lines</a>. This has happened rarely in our repo, but so far it didn't cause any trouble for me.</p>
    singulars
    1. This table or related slice is empty.
    1. POgit-svn workflow for merging using svn.pushmergeinfo
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USCommunity
    1. USCarsten
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POgit-svn workflow for merging using svn.pushmergeinfo
      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. VTAcceptedByOriginator
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. CODo you have any details on avoiding the self-referential mergeinfo when merging the feature branch down to trunk?
      singulars
      1. PO
      1. USDougnukem
    2. CONo, so far I just ignored the issue without any problem. Not sure if some svn clients might have an issue with it, but so far we didn't experience any problems with git-svn, command-line svn or Eclipse Subversive (and I think Tortoise SVN, too)
      singulars
      1. PO
      1. USCarsten
    3. CO**EDIT** Re-reading the detailed description at [link](http://thread.gmane.org/gmane.comp.version-control.git/191932), this probably never hit us because we've done all the (rare) reintegration merges that happened in that time with git.
      singulars
      1. PO
      1. USCarsten
 

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