How to switch from a subrepo development to a new repo keeping all the history?












2















Here is a realistic scenario with a bit simplified main actors:




  • There is a repo: device here


  • There is a repo: ourdevice here



device is something developed by a third person.



ourdevice is my repo, which I created to work on further development of the device. I wanted to be able to do my own changes, but also be able to occasionally merge in the changes introduced by that third person. So I chose to go with subtree back then. This article was used as a reference heavily.



Now, I've come to a point where I am quite happy with my development of ourdevice and I'd like to embed ourdevice in a system developed for embedding the device. Unfortunately, there is that additional level of hierarchy: device is a subtree of the ourdevice, thus the folder structure in ourdevice is: ourdevice/device/-all-the-rest-.



I'd like to translate ourdevice into a new repo, be it BitBucket or GitHub by achieving both:




  1. removing that additional level of hierarchy, and

  2. keeping all the development history (commits, branches, everything) while working on device within ourdevice.


Is there any way to do this? Thank you.










share|improve this question



























    2















    Here is a realistic scenario with a bit simplified main actors:




    • There is a repo: device here


    • There is a repo: ourdevice here



    device is something developed by a third person.



    ourdevice is my repo, which I created to work on further development of the device. I wanted to be able to do my own changes, but also be able to occasionally merge in the changes introduced by that third person. So I chose to go with subtree back then. This article was used as a reference heavily.



    Now, I've come to a point where I am quite happy with my development of ourdevice and I'd like to embed ourdevice in a system developed for embedding the device. Unfortunately, there is that additional level of hierarchy: device is a subtree of the ourdevice, thus the folder structure in ourdevice is: ourdevice/device/-all-the-rest-.



    I'd like to translate ourdevice into a new repo, be it BitBucket or GitHub by achieving both:




    1. removing that additional level of hierarchy, and

    2. keeping all the development history (commits, branches, everything) while working on device within ourdevice.


    Is there any way to do this? Thank you.










    share|improve this question

























      2












      2








      2


      1






      Here is a realistic scenario with a bit simplified main actors:




      • There is a repo: device here


      • There is a repo: ourdevice here



      device is something developed by a third person.



      ourdevice is my repo, which I created to work on further development of the device. I wanted to be able to do my own changes, but also be able to occasionally merge in the changes introduced by that third person. So I chose to go with subtree back then. This article was used as a reference heavily.



      Now, I've come to a point where I am quite happy with my development of ourdevice and I'd like to embed ourdevice in a system developed for embedding the device. Unfortunately, there is that additional level of hierarchy: device is a subtree of the ourdevice, thus the folder structure in ourdevice is: ourdevice/device/-all-the-rest-.



      I'd like to translate ourdevice into a new repo, be it BitBucket or GitHub by achieving both:




      1. removing that additional level of hierarchy, and

      2. keeping all the development history (commits, branches, everything) while working on device within ourdevice.


      Is there any way to do this? Thank you.










      share|improve this question














      Here is a realistic scenario with a bit simplified main actors:




      • There is a repo: device here


      • There is a repo: ourdevice here



      device is something developed by a third person.



      ourdevice is my repo, which I created to work on further development of the device. I wanted to be able to do my own changes, but also be able to occasionally merge in the changes introduced by that third person. So I chose to go with subtree back then. This article was used as a reference heavily.



      Now, I've come to a point where I am quite happy with my development of ourdevice and I'd like to embed ourdevice in a system developed for embedding the device. Unfortunately, there is that additional level of hierarchy: device is a subtree of the ourdevice, thus the folder structure in ourdevice is: ourdevice/device/-all-the-rest-.



      I'd like to translate ourdevice into a new repo, be it BitBucket or GitHub by achieving both:




      1. removing that additional level of hierarchy, and

      2. keeping all the development history (commits, branches, everything) while working on device within ourdevice.


      Is there any way to do this? Thank you.







      git github bitbucket subtree






      share|improve this question













      share|improve this question











      share|improve this question




      share|improve this question










      asked Nov 12 '18 at 23:12









      apajapaj

      7910




      7910
























          0






          active

          oldest

          votes











          Your Answer






          StackExchange.ifUsing("editor", function () {
          StackExchange.using("externalEditor", function () {
          StackExchange.using("snippets", function () {
          StackExchange.snippets.init();
          });
          });
          }, "code-snippets");

          StackExchange.ready(function() {
          var channelOptions = {
          tags: "".split(" "),
          id: "1"
          };
          initTagRenderer("".split(" "), "".split(" "), channelOptions);

          StackExchange.using("externalEditor", function() {
          // Have to fire editor after snippets, if snippets enabled
          if (StackExchange.settings.snippets.snippetsEnabled) {
          StackExchange.using("snippets", function() {
          createEditor();
          });
          }
          else {
          createEditor();
          }
          });

          function createEditor() {
          StackExchange.prepareEditor({
          heartbeatType: 'answer',
          autoActivateHeartbeat: false,
          convertImagesToLinks: true,
          noModals: true,
          showLowRepImageUploadWarning: true,
          reputationToPostImages: 10,
          bindNavPrevention: true,
          postfix: "",
          imageUploader: {
          brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
          contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
          allowUrls: true
          },
          onDemand: true,
          discardSelector: ".discard-answer"
          ,immediatelyShowMarkdownHelp:true
          });


          }
          });














          draft saved

          draft discarded


















          StackExchange.ready(
          function () {
          StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53271448%2fhow-to-switch-from-a-subrepo-development-to-a-new-repo-keeping-all-the-history%23new-answer', 'question_page');
          }
          );

          Post as a guest















          Required, but never shown

























          0






          active

          oldest

          votes








          0






          active

          oldest

          votes









          active

          oldest

          votes






          active

          oldest

          votes
















          draft saved

          draft discarded




















































          Thanks for contributing an answer to Stack Overflow!


          • Please be sure to answer the question. Provide details and share your research!

          But avoid



          • Asking for help, clarification, or responding to other answers.

          • Making statements based on opinion; back them up with references or personal experience.


          To learn more, see our tips on writing great answers.




          draft saved


          draft discarded














          StackExchange.ready(
          function () {
          StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53271448%2fhow-to-switch-from-a-subrepo-development-to-a-new-repo-keeping-all-the-history%23new-answer', 'question_page');
          }
          );

          Post as a guest















          Required, but never shown





















































          Required, but never shown














          Required, but never shown












          Required, but never shown







          Required, but never shown

































          Required, but never shown














          Required, but never shown












          Required, but never shown







          Required, but never shown







          Popular posts from this blog

          Florida Star v. B. J. F.

          Danny Elfman

          Retrieve a Users Dashboard in Tumblr with R and TumblR. Oauth Issues