Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>I'm no expert, but these are the experiences I've made (<a href="https://stackoverflow.com/questions/1880405/can-different-git-svn-clones-of-the-same-svn-repository-expect-to-be-able-to-shar/3422422#3422422">related answer</a>).</p> <ol> <li>I think it doesn't matter. The important thing is that you rebase the latest changes from SVN into the branch you are going to dcommit from.</li> <li>Let other branches receive the changes through SVN. If you want a single SVN commit from a series of git commits, squash them together first.</li> <li>I think this doesn't matter either. You're going to rebase the latest changes from SVN, and need to get them linearly in front of your Git commits. If you do git svn rebase in master, and then rebase master into a feature branch, or the other way around is same-same. Afterwards you probably want to delete the branch, as it has done its work (as per SVN restrictions, you're not allowed to merge again).</li> <li>Always let changes flow into other branches and repos through SVN rebasing. </li> </ol> <p>Just try it out and try to get the most simple/practical workflow for you and your team. Try to keep branches short-lived (SVN won't get any notion of them anyway), and remember that the commits must always be linearized at the top of your log before you dcommit back. </p>
    singulars
    1. This table or related slice is empty.
    1. POlooking for ideal git-svn workflow
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USCommunity
    1. USThomas Ferris Nicolaisen
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POlooking for ideal git-svn workflow
      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. COThanks for the suggestions - one thing I've realized is merge --squash is great if the branch is finished but if I want to keep it around for future work (eg, qa) then it's a big problem because I always run into conflicts when I rebase into the branch the next time because the merges don't line up. It seems the best solution is the rebase -i my git branches until I have acceptable commit messages and then svn dcommit. Then I can rebase new upstream svn commits. Does that sound right?
      singulars
      1. PO
      1. USYehosef
    2. COIf you've pushed a branch into SVN, you can't do it again, because SVN doesn't *get* branches the way git does. That's why you get conflicts. Keeping the branch around is hardly ever interesting. You need to linearize your git-commits before dcommitting. This doesn't mean you have to squash them. You can push a series of git commits to SVN at once, as long as they're in the right order: Before dcommit, in the git-log, your local commits should be on top, over the svn-id commits.
      singulars
      1. PO
      1. USThomas Ferris Nicolaisen
    3. COI didn't try it recently, but I thought if I have a branch and I merge that into my master and dcommit from there, when I rebase the branch again, it'l be started after my master commits (which were the commits from the branch merge) - I thought that from git's perspective, it's the same thing - it's not like I need to dcommit from my master and then svn rebase again to get the "svn version" of my commits, no? Most of my problems so far were because I wanted to keep lots of git commits and just a few svn commits - and I now see that that is not going to work if the branch is to stay around.
      singulars
      1. PO
      1. USYehosef
 

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