Databases
StackOverflow2013
Postsdbo
POGit svn: how do I work with "partial" branches?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit svn: how do I work with "partial" branches?
    primarykey
    data
    text
    <p>By "partial", I mean the branches in my SVN repository were not copied from trunk/, but from a subdirectory of trunk/. Here's the svn repo layout:</p> <pre><code>trunk/ core projectA projectB ... branches/ core_new_feature (branched from "core" on trunk) another_branch ... </code></pre> <p>I have inited my local repository and fetched:</p> <pre><code>mkdir git-svn-repo cd git-svn-repo git svn init -s svn+ssh://me@svn-server/path/to/repository git fetch &lt;wait four days&gt; </code></pre> <p>Now I'm trying to work on the "core_new_feature" branch. git branch -a shows:</p> <pre><code>* master remotes/core_new_feature ... (a bunch of other branches) </code></pre> <p>So I try:</p> <pre><code>git checkout --track -b git_new_feature remotes/core_new_feature </code></pre> <p>Git checks out files, and appears to be working. Yet when I try to browse my freshly checked out branch (ls local-git-root/core/), I get weirdness. Specifically, I don't see my source code or any of the existing changes on the core_new_feature SVN branch. All I see under core/ are a few empty directories, a seemingly random smattering of my exiting source tree under core.</p> <p>However, the "core_new_feature" source <strong>is</strong> available under local-git-root/src/ - it's just right there in the root of my git repository. projectA and projectB from above have disappeared.</p> <p>What I need is for the changes on the "core_new_feature" svn branch to go to the correct location (namely local-git-root/core/), and for the other projects to not disappear</p> <p>Clearly I'm missing some crucial step here, but I've looked through all the examples I could find, and none seems to deal with this issue. Maybe I need to set up my local repository differently?</p> <p>For reference, here's my .git/config file:</p> <pre><code>[core] repositoryformatversion = 0 filemode = false bare = false logallrefupdates = true symlinks = false ignorecase = true hideDotFiles = dotGitOnly [svn-remote "svn"] url = svn+ssh://me@svn-server/path/to/repository fetch = repository/trunk:refs/remotes/trunk branches = repository/branches/*:refs/remotes/* tags = repository/tags/*:refs/remotes/tags/* [branch "core_new_feature"] remote = . merge = refs/remotes/core_new_feature </code></pre> <p>My repository uses the standard branches/ tags/ trunk/ layout. I ran the commands using the git-bash shell that msysgit provides. Version is 1.7.4.</p> <p>Thanks in advance for any assistance.</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USparadoxbomb
    1. USparadoxbomb
    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
    1. VO
      singulars
      1. POGit svn: how do I work with "partial" branches?
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POGit svn: how do I work with "partial" branches?
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POGit svn: how do I work with "partial" branches?
      1. This table or related slice is empty.
      1. VTUpMod
    1. COCan you please include the commands you used for performing the git-svn clone, as well as the contents of the .git/config file?
      singulars
      1. POGit svn: how do I work with "partial" branches?
      1. USThomas Ferris Nicolaisen
    2. COYup. Added to original post.
      singulars
      1. POGit svn: how do I work with "partial" branches?
      1. USparadoxbomb
    3. COFor the record: I never did end up solving this, so I'm leaving it unanswered. It sucked, but I ended up forcing everyone to commit their code to trunk, and then did the full migrate to Git without any interim git-svn. A bit painful but it worked out.
      singulars
      1. POGit svn: how do I work with "partial" branches?
      1. USparadoxbomb
 

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