Databases
StackOverflow2013
Postsdbo
POUsing subtree-merge strategy, history is not merging
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POUsing subtree-merge strategy, history is not merging
    primarykey
    data
    text
    <p>I'm trying to use an external SVN repository as a subtree in my repository by 'subtree-merging' it in. I believe that this should keep the history of the files in the library intact, but it's not working - the files from the library that are merged into a subtree in my master branch have no history but for the commit when I add them - here's a history to show what I mean, precisely what I'm going to get to this state follows.</p> <pre><code>lappy8086:YACYAML jamie$ git log --graph * commit 0cc6c4e5061741e67d009f3375ce1d2bcd3ab540 | Author: James Montgomerie | Date: Thu May 17 12:04:43 2012 +0100 | | Subtree-merge in libYAML (from a git-svn checkout). | * commit b5af5af109d77f6adafebc3dcf5a4796a5035a2e Author: James Montgomerie Date: Thu May 17 11:47:32 2012 +0100 First commit, add .gitignore. </code></pre> <p>Here's what I'm doing to try to get this to work:</p> <pre><code># check out SVN repo git svn clone http://svn.pyyaml.org/libyaml/branches/stable libYAML # create my repo mkdir YACYAML cd YACYAML git init touch .gitignore git add .gitignore git commit -m "First commit, add .gitignore" # Fetch from git-svn repo I got earlier git remote add libyaml-svn ../libYAML/ git fetch libyaml-svn git checkout -b libyaml-svn libyaml-svn/master # Switch back to master, and try to merge in subtree git checkout master git read-tree --prefix=libYAML/ -u libyaml-svn/master git commit -m "Merge in libYAML as subtree (from git-svn checkout of SVN repo)" </code></pre> <p>This 'works', but, as I said, when I look at my history I expect to see the full history from the libYAML repo, but I don't - it's as above.</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USth_in_gs
    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
    1. VO
      singulars
      1. POUsing subtree-merge strategy, history is not merging
      1. USCarlton Gibson
      1. VTFavorite
    2. VO
      singulars
      1. POUsing subtree-merge strategy, history is not merging
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POUsing subtree-merge strategy, history is not 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