{"thread":{"id":"30013","subject":"New git-subtree almost ready","startedAt":"2012-03-21T03:36:25Z","lastAt":"2012-03-24T08:00:42Z","messageCount":3,"participants":["greened@obbligato.org","David Aguilar"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"187376","messageId":"87limu7hhi.fsf@smith.obbligato.org","threadId":"30013","inReplyTo":null,"subject":"New git-subtree almost ready","fromName":"","fromEmail":"greened@obbligato.org","sentAt":"2012-03-21T03:36:25Z","receivedAt":"2012-03-21T03:36:25Z","isPatch":false,"sender":{"key":"greened@obbligato.org","avatar":"https://avatars.githubusercontent.com/u/5291869?v=4"},"body":"I've got the git-subtree merge in pretty good shape now.  After being\ntaught about TEST_DIRECTORY, I've been able to get rid of all of the\ntest system changes and can run the git-subtree tests using the stock\ntest infrastructure.\n\nBefore I can put the new tree up I need a little help.  Since it's been\na while since I posted the last version of the tree, I tried to update\nfrom upstream master.  git-subtree is in a separate branch (it wqas\napplied as a subtree merge) so I did the usual switch-to-master-and-pull\nthing.\n\nHowever, now I don't know how to rebase from master to the subtree\nbranch.  If I do a \"git rebase master\" then the subtree merge gets\nre-applied as if the files were placed in the root directory rather than\nin the target directory of the original subtree merge.\n\nThe problem is described pretty well here and the issue has been covered\non the mailing list before:\n\nhttp://groups.google.com/group/git-users/browse_thread/thread/d54bacd234d95639\nhttp://comments.gmane.org/gmane.comp.version-control.git/191934\n\nI can think of a few strategies to move forward.\n\n1. Keep the git-subtree branch where it is.  Don't rebase and just push\n   the branch to a public repository.  Make Junio do the hard work.  :)\n\n2. Split the subtree merge, remove it from the git repository, rebase\n   from master and then re-subtree-merge it.\n\n3. Don't do a rebase, just do a regular merge from master.\n\nWhich of these would be best to integrate git-subtree into\nJunio's repository?\n\ngit-web guys, how did you handle this situation?\n\nThanks!\n\n                           -David\n"},{"id":"187624","messageId":"87y5qq65ar.fsf@smith.obbligato.org","threadId":"30013","inReplyTo":"87limu7hhi.fsf@smith.obbligato.org","subject":"Re: New git-subtree almost ready","fromName":"","fromEmail":"greened@obbligato.org","sentAt":"2012-03-24T03:34:04Z","receivedAt":"2012-03-24T03:34:04Z","isPatch":false,"sender":{"key":"greened@obbligato.org","avatar":"https://avatars.githubusercontent.com/u/5291869?v=4"},"body":"greened@obbligato.org writes:\n\n> Before I can put the new tree up I need a little help.\n\nAnyone?  How do I properly rebase a subtree merge?\n\nThanks!\n\n                            -Dave\n"},{"id":"187629","messageId":"CAJDDKr6VSgZksGkXg2oW4nwWCggW1M5TapiyeH-rAkfo+FjnmQ@mail.gmail.com","threadId":"30013","inReplyTo":"87limu7hhi.fsf@smith.obbligato.org","subject":"Re: New git-subtree almost ready","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2012-03-24T08:00:42Z","receivedAt":"2012-03-24T08:00:42Z","isPatch":false,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Tue, Mar 20, 2012 at 8:36 PM,  <greened@obbligato.org> wrote:\n> I've got the git-subtree merge in pretty good shape now.  After being\n> taught about TEST_DIRECTORY, I've been able to get rid of all of the\n> test system changes and can run the git-subtree tests using the stock\n> test infrastructure.\n>\n> Before I can put the new tree up I need a little help.  Since it's been\n> a while since I posted the last version of the tree, I tried to update\n> from upstream master.  git-subtree is in a separate branch (it wqas\n> applied as a subtree merge) so I did the usual switch-to-master-and-pull\n> thing.\n>\n> However, now I don't know how to rebase from master to the subtree\n> branch.  If I do a \"git rebase master\" then the subtree merge gets\n> re-applied as if the files were placed in the root directory rather than\n> in the target directory of the original subtree merge.\n>\n> The problem is described pretty well here and the issue has been covered\n> on the mailing list before:\n>\n> http://groups.google.com/group/git-users/browse_thread/thread/d54bacd234d95639\n> http://comments.gmane.org/gmane.comp.version-control.git/191934\n>\n> I can think of a few strategies to move forward.\n>\n> 1. Keep the git-subtree branch where it is.  Don't rebase and just push\n>   the branch to a public repository.  Make Junio do the hard work.  :)\n\nHehe, I'm pretty sure the option that involves Junio doing the least\namount of work is the option to take ;-)\n\n\n\n> 2. Split the subtree merge, remove it from the git repository, rebase\n>   from master and then re-subtree-merge it.\n\nI don't know if git-gui or gitk maintainers have advice for you, but\nit sounds like this may be the best option, IMO.  git-subtree is not\nyet part of the git history.\n\ngit is in a RC cycle right now, which is likely why you have not heard\nmuch on this topic (new feature).  Folks will be busy testing the RC\nand ensuring we have no regressions.\n\nLooking forward to git-subtree,\n-- \nDavid\n"}]}