{"thread":{"id":"33214","subject":"Recovering from a loss of sync between git and svn","startedAt":"2013-03-18T05:03:30Z","lastAt":"2013-03-18T06:09:36Z","messageCount":2,"participants":["Jon Seymour"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"211546","messageId":"CAH3Anrq4y54YA=qeEbO5z1FKB7Adg4G8vf4jmPLzLWa6tky0wQ@mail.gmail.com","threadId":"33214","inReplyTo":null,"subject":"Recovering from a loss of sync between git and svn","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2013-03-18T05:03:30Z","receivedAt":"2013-03-18T05:03:30Z","isPatch":false,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"G'day,\n\nI managed to lose sync between the git-svn repo that I am using to\ntrack an svn repo. In particular, the git-svn repo lost the content of\nabout 5 commits with the net result that the git-svn repo and the svn\nrepo it tracks have a difference of opinion about what the contents of\ntrunk are for the files involved in the missing commits.\n\nThe situation arose because I used --ignore-paths trunk on a\ngit-svn-fetch when I was trying to deal with an SVN user that had\ncopied trunk into the same SVN tag twice (which caused the source tree\nto be duplicated under the trunk directory of the SVN tag).\n\nI was hoping that --ignore-paths trunk would cause the git-svn copy of\nthe tag to exclude the unwanted copy of the trunk directory in the\ntag. Instead, it appears to have caused my fetches of subsequent\ncommits to SVN trunk to be empty, resulting in divergence between by\ngit-svn repo and the SVN repo itself.\n\nDoes anyone have any tips about how I can fix this other than pulling\nthe entire SVN repo again?\n\njon.\n"},{"id":"211548","messageId":"CAH3AnroBmiTb45SG4FeL57OXUrXXVWKsvkOa9b2q5eLi7Vvudw@mail.gmail.com","threadId":"33214","inReplyTo":"CAH3Anrq4y54YA=qeEbO5z1FKB7Adg4G8vf4jmPLzLWa6tky0wQ@mail.gmail.com","subject":"Re: Recovering from a loss of sync between git and svn","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2013-03-18T06:09:36Z","receivedAt":"2013-03-18T06:09:36Z","isPatch":false,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"Ah, answering my own question....\n\nI can see git svn reset does exactly what I need.\n\njon.\n\nOn Mon, Mar 18, 2013 at 4:03 PM, Jon Seymour <jon.seymour@gmail.com> wrote:\n> G'day,\n>\n> I managed to lose sync between the git-svn repo that I am using to\n> track an svn repo. In particular, the git-svn repo lost the content of\n> about 5 commits with the net result that the git-svn repo and the svn\n> repo it tracks have a difference of opinion about what the contents of\n> trunk are for the files involved in the missing commits.\n>\n> The situation arose because I used --ignore-paths trunk on a\n> git-svn-fetch when I was trying to deal with an SVN user that had\n> copied trunk into the same SVN tag twice (which caused the source tree\n> to be duplicated under the trunk directory of the SVN tag).\n>\n> I was hoping that --ignore-paths trunk would cause the git-svn copy of\n> the tag to exclude the unwanted copy of the trunk directory in the\n> tag. Instead, it appears to have caused my fetches of subsequent\n> commits to SVN trunk to be empty, resulting in divergence between by\n> git-svn repo and the SVN repo itself.\n>\n> Does anyone have any tips about how I can fix this other than pulling\n> the entire SVN repo again?\n>\n> jon.\n"}]}