{"thread":{"id":"16917","subject":"git svn rebase totally confused; just need some sorta reset","startedAt":"2008-12-29T21:39:45Z","lastAt":"2008-12-29T22:04:56Z","messageCount":3,"participants":["davetron5000","Boyd Stephen Smith Jr.","Jacob Helwig"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"98916","messageId":"cd7145c4-a4bb-4ef6-95db-7c4058b6774c@m16g2000vbp.googlegroups.com","threadId":"16917","inReplyTo":null,"subject":"git svn rebase totally confused; just need some sorta reset","fromName":"davetron5000","fromEmail":"davetron5000@gmail.com","sentAt":"2008-12-29T21:39:45Z","receivedAt":"2008-12-29T21:39:45Z","isPatch":false,"sender":{"key":"davetron5000@gmail.com","avatar":"https://gravatar.com/avatar/9ec09086e36c4e609dfc23a4582d2c7adf7dc2fb1796f74492d52727efa6ba86?d=mp&s=160"},"body":"So, my repo is in a weird state. I have committed my changes to svn\nvia git svn dcommit, and it appears that the svn repository has all my\nchanges.\n\nHowever, git svn rebase fails with conflicts, on almost every single\ncommit I've made. I think that ultimately, I merged a branch in\nnumerous times and git seems confused. BUT, I don't really care about\npreserving that; I just want my master branch to be clean.\n\nIs there a way I can basically say: commit XXX is the same as the\ncurrent HEAD of SVN, so treat things as if that's the case. i.e.\ntreat things the same as if I had just done a clean git svn clone.\n"},{"id":"98919","messageId":"8c9a060812291404m304e1920yd5ba7e40a6098b30@mail.gmail.com","threadId":"16917","inReplyTo":"cd7145c4-a4bb-4ef6-95db-7c4058b6774c@m16g2000vbp.googlegroups.com","subject":"Re: git svn rebase totally confused; just need some sorta reset","fromName":"Jacob Helwig","fromEmail":"jacob.helwig@gmail.com","sentAt":"2008-12-29T22:04:04Z","receivedAt":"2008-12-29T22:04:04Z","isPatch":false,"sender":{"key":"jacob.helwig@gmail.com","avatar":"https://avatars.githubusercontent.com/u/14557?v=4"},"body":"On Mon, Dec 29, 2008 at 13:39, davetron5000 wrote:\n> So, my repo is in a weird state. I have committed my changes to svn\n> via git svn dcommit, and it appears that the svn repository has all my\n> changes.\n>\n> However, git svn rebase fails with conflicts, on almost every single\n> commit I've made. I think that ultimately, I merged a branch in\n> numerous times and git seems confused. BUT, I don't really care about\n> preserving that; I just want my master branch to be clean.\n>\n> Is there a way I can basically say: commit XXX is the same as the\n> current HEAD of SVN, so treat things as if that's the case. i.e.\n> treat things the same as if I had just done a clean git svn clone.\n>\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n>\n\ngit checkout local-branch-you-want-to-fix\ngit reset --hard name-of-your-git-svn-branch (probably trunk, or\n/trunk, if you setup git-svn with the --prefix=/\noption).\n\nThis will wipe out anything you have in local-branch-you-want-to-fix,\nand reset it to the same state that name-of-your-git-svn-branch is in.\n\n-Jacob\n"},{"id":"98918","messageId":"200812291605.00112.bss@iguanasuicide.net","threadId":"16917","inReplyTo":"cd7145c4-a4bb-4ef6-95db-7c4058b6774c@m16g2000vbp.googlegroups.com","subject":"Re: git svn rebase totally confused; just need some sorta reset","fromName":"Boyd Stephen Smith Jr.","fromEmail":"bss@iguanasuicide.net","sentAt":"2008-12-29T22:04:56Z","receivedAt":"2008-12-29T22:04:56Z","isPatch":false,"sender":{"key":"bss@iguanasuicide.net","avatar":"https://gravatar.com/avatar/84b95eeff194b816c1568b1339e63e4b229825298664a9037b9f1ec713ead1e3?d=mp&s=160"},"body":"On Monday 2008 December 29 15:39:45 davetron5000 wrote:\n> Is there a way I can basically say: commit XXX is the same as the\n> current HEAD of SVN, so treat things as if that's the case.\n\nNo, commits are immutable and their \"name\" is based on their contents. \nHowever, if you've fetched the current HEAD of SVN, you've already got a \ncommit that corresponds (roughly) to the HEAD of SVN.\n\n> i.e. \n> treat things the same as if I had just done a clean git svn clone.\n\nOn my git-svn created repository, I have a special ref \"git-svn\" that appears \nto refer to the \"HEAD of SVN\" commit. (\"git branch -a\" shows it.) If that's \nalso the case with you:\n\ngit branch -m master master.save\ngit checkout -b master git-svn\n# Make sure you are seeing what you want.\ngit branch -D master.save\n\nshould get you to where you want.\n\nHeck, \"git reset git-svn\" might work.\n-- \nBoyd Stephen Smith Jr. ,= ,-_-. =. \nbss@iguanasuicide.net ((_/)o o(\\_))\nICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-' \nhttp://iguanasuicide.net/ \\_/ \n"}]}