{"thread":{"id":"11514","subject":"StGIT loses Git commit using \"stg repair\"; I miss \"stg assimilate\"","startedAt":"2008-01-07T22:45:18Z","lastAt":"2008-01-07T23:15:13Z","messageCount":3,"participants":["Jakub Narebski","David Kågedal"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"64682","messageId":"200801072345.21585.jnareb@gmail.com","threadId":"11514","inReplyTo":null,"subject":"StGIT loses Git commit using \"stg repair\"; I miss \"stg assimilate\"","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-01-07T22:45:18Z","receivedAt":"2008-01-07T22:45:18Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"I have StGIT branch with no patches applied: all patches are on stack.\nI have accidentally added git commit on top of StGIT branch head.\nI tried to use \"stg assimilate\" to turn this commit into StGIT commit, \napplied, but new version of StGIT has only \"stg repair\". And the \nsequence\n\n # stg repair\n # stg rebase origin\n\nmade me lose this git commit (well, up to reflog of course). This should \nnot happen! Why assimilate got removed?\n\n4206:[gitweb/web@git]# stg --version\nStacked GIT 0.14.1\ngit version 1.5.3.7\nPython version 2.4.3 (#1, Jun 13 2006, 16:41:18) \n[GCC 4.0.2 20051125 (Red Hat 4.0.2-8)]\n\n-- \nJakub Narebski\nPoland\n"},{"id":"64684","messageId":"873at9z0w2.fsf@lysator.liu.se","threadId":"11514","inReplyTo":"200801072345.21585.jnareb@gmail.com","subject":"Re: StGIT loses Git commit using \"stg repair\"; I miss \"stg assimilate\"","fromName":"David Kågedal","fromEmail":"davidk@lysator.liu.se","sentAt":"2008-01-07T23:11:57Z","receivedAt":"2008-01-07T23:11:57Z","isPatch":false,"sender":{"key":"davidk@lysator.liu.se","avatar":"https://avatars.githubusercontent.com/u/60530?v=4"},"body":"Jakub Narebski <jnareb@gmail.com> writes:\n\n> I have StGIT branch with no patches applied: all patches are on stack.\n> I have accidentally added git commit on top of StGIT branch head.\n> I tried to use \"stg assimilate\" to turn this commit into StGIT commit, \n> applied, but new version of StGIT has only \"stg repair\". And the \n> sequence\n\nIf you have no patches, there is nothing to assimilate or repair. Your\npatch stack is considered to be on top of your new commit, so if you\npush a patch it will appear on top of the commit you just created.\n\nTo turn your new commit into a patch, use \"stg uncommit\".\n\n>  # stg repair\n>  # stg rebase origin\n>\n> made me lose this git commit (well, up to reflog of course). This should \n> not happen! Why assimilate got removed?\n\nrepair does exactly what assimilate did in this case, so it would not\nhave helped you.\n\n-- \nDavid Kågedal\n"},{"id":"64685","messageId":"87y7b1xm66.fsf@lysator.liu.se","threadId":"11514","inReplyTo":"873at9z0w2.fsf@lysator.liu.se","subject":"Re: StGIT loses Git commit using \"stg repair\"; I miss \"stg assimilate\"","fromName":"David Kågedal","fromEmail":"davidk@lysator.liu.se","sentAt":"2008-01-07T23:15:13Z","receivedAt":"2008-01-07T23:15:13Z","isPatch":false,"sender":{"key":"davidk@lysator.liu.se","avatar":"https://avatars.githubusercontent.com/u/60530?v=4"},"body":"David Kågedal <davidk@lysator.liu.se> writes:\n\n> Jakub Narebski <jnareb@gmail.com> writes:\n>\n>> I have StGIT branch with no patches applied: all patches are on stack.\n>> I have accidentally added git commit on top of StGIT branch head.\n>> I tried to use \"stg assimilate\" to turn this commit into StGIT commit, \n>> applied, but new version of StGIT has only \"stg repair\". And the \n>> sequence\n>\n> If you have no patches, there is nothing to assimilate or repair. Your\n\nThat should have been \"if you have no patches *applied* ...\"\n\n> patch stack is considered to be on top of your new commit, so if you\n> push a patch it will appear on top of the commit you just created.\n>\n> To turn your new commit into a patch, use \"stg uncommit\".\n>\n>>  # stg repair\n>>  # stg rebase origin\n>>\n>> made me lose this git commit (well, up to reflog of course). This should \n>> not happen! Why assimilate got removed?\n>\n> repair does exactly what assimilate did in this case, so it would not\n> have helped you.\n\n-- \nDavid Kågedal\n"}]}