{"thread":{"id":"16530","subject":"git-svn rebase \"problems\"","startedAt":"2008-12-01T03:17:56Z","lastAt":"2008-12-02T15:32:56Z","messageCount":4,"participants":["Joe Fiorini","Peter Harris","Michael J Gruber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"96808","messageId":"73fd69b50811301917j6535f289uf177976707914e46@mail.gmail.com","threadId":"16530","inReplyTo":null,"subject":"git-svn rebase \"problems\"","fromName":"Joe Fiorini","fromEmail":"joe@faithfulgeek.org","sentAt":"2008-12-01T03:17:56Z","receivedAt":"2008-12-01T03:17:56Z","isPatch":false,"sender":{"key":"joe@faithfulgeek.org","avatar":null},"body":"I'm having some problems with git svn rebase. I'm pretty sure this is\njust the way git works, not a problem per se. But it's causing trouble\nfor me and my team.\nMy team is currently on Subversion. I'm trying to convince some people\nthat git is a good way to go.\n\nSo I'm using git-svn. My team tends to commit to the svn server fairly\noften. It has happened more than once that, because git svn rebase\napplies each svn commit sequentially, some of the commits will\nconflict with each other - whether or not I have ever touched the\nfile. Obviously, this is a big problem because if I've never touched\nthe file, then I probably won't know exactly how to resolve the merge\n(the merge markers haven't been solely reliable).\n\nIs there anything I could do to get around this without having to\nmerge code I'm unfamiliar with?\n\nThanks all!\nJoe Fiorini\n--\njoe fiorini\nhttp://www.faithfulgeek.org\n// freelancing & knowledge sharing\n"},{"id":"96946","messageId":"73fd69b50812020656u3fd17015n267f694236982e5@mail.gmail.com","threadId":"16530","inReplyTo":"73fd69b50811301917j6535f289uf177976707914e46@mail.gmail.com","subject":"Re: git-svn rebase \"problems\"","fromName":"Joe Fiorini","fromEmail":"joe@faithfulgeek.org","sentAt":"2008-12-02T14:56:45Z","receivedAt":"2008-12-02T14:56:45Z","isPatch":false,"sender":{"key":"joe@faithfulgeek.org","avatar":null},"body":"Are there any other details I can provide to get an answer on this?\n\nThanks!\nJoe\n\nOn Sun, Nov 30, 2008 at 10:17 PM, Joe Fiorini wrote:\n> I'm having some problems with git svn rebase. I'm pretty sure this is\n> just the way git works, not a problem per se. But it's causing trouble\n> for me and my team.\n> My team is currently on Subversion. I'm trying to convince some people\n> that git is a good way to go.\n>\n> So I'm using git-svn. My team tends to commit to the svn server fairly\n> often. It has happened more than once that, because git svn rebase\n> applies each svn commit sequentially, some of the commits will\n> conflict with each other - whether or not I have ever touched the\n> file. Obviously, this is a big problem because if I've never touched\n> the file, then I probably won't know exactly how to resolve the merge\n> (the merge markers haven't been solely reliable).\n>\n> Is there anything I could do to get around this without having to\n> merge code I'm unfamiliar with?\n>\n> Thanks all!\n> Joe Fiorini\n> --\n> joe fiorini\n> http://www.faithfulgeek.org\n> // freelancing & knowledge sharing\n>\n\n\n\n-- \njoe fiorini\nhttp://www.faithfulgeek.org\n// freelancing & knowledge sharing\n"},{"id":"96949","messageId":"eaa105840812020721t299009bcv15e2805cc040854@mail.gmail.com","threadId":"16530","inReplyTo":"73fd69b50812020656u3fd17015n267f694236982e5@mail.gmail.com","subject":"Re: git-svn rebase \"problems\"","fromName":"Peter Harris","fromEmail":"git@peter.is-a-geek.org","sentAt":"2008-12-02T15:21:36Z","receivedAt":"2008-12-02T15:21:36Z","isPatch":false,"sender":{"key":"git@peter.is-a-geek.org","avatar":null},"body":"On Tue, Dec 2, 2008 at 9:56 AM, Joe Fiorini wrote:\n> Are there any other details I can provide to get an answer on this?\n\nMaybe an actual script that reproduces the problem you're seeing?\n\n> On Sun, Nov 30, 2008 at 10:17 PM, Joe Fiorini wrote:\n>>\n>> So I'm using git-svn. My team tends to commit to the svn server fairly\n>> often. It has happened more than once that, because git svn rebase\n>> applies each svn commit sequentially, some of the commits will\n>> conflict with each other - whether or not I have ever touched the\n>> file.\n\nThat sounds like you're \"git pull\"ing from each other, yes? I can't\nimagine any other way you'd get conflicts on files you have never\ntouched.\n\n>> Is there anything I could do to get around this without having to\n>> merge code I'm unfamiliar with?\n\nIf the problem is that git-svn doesn't recognize git-svn commits that\nhave come from others via git-pull, you might be able to get away with\n\"rm -rf .git/svn\" to force git-svn to rebuild its index. Git 1.6.1rc\nor newer doesn't need this workaround, since it has incremental index\nupdating.\n\nIf the problem is that others' branches are conflicting with svn\ncheckins, switch back to your own branch so you're only rebasing your\nown code, ask the person who wrote the other code to fix the\nconflicts, and re-pull. This assumes a work-flow where you only ever\nmake commits on top of an un-merged state (which you pretty much have\nto adopt anyway in a rebase-heavy environment such as one based on\ngit-svn).\n\nPeter Harris\n"},{"id":"96952","messageId":"49355528.80503@drmicha.warpmail.net","threadId":"16530","inReplyTo":"73fd69b50812020656u3fd17015n267f694236982e5@mail.gmail.com","subject":"Re: git-svn rebase \"problems\"","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2008-12-02T15:32:56Z","receivedAt":"2008-12-02T15:32:56Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Joe Fiorini venit, vidit, dixit 02.12.2008 15:56:\n> Are there any other details I can provide to get an answer on this?\n> \n> Thanks!\n> Joe\n> \n> On Sun, Nov 30, 2008 at 10:17 PM, Joe Fiorini wrote:\n>> I'm having some problems with git svn rebase. I'm pretty sure this is\n>> just the way git works, not a problem per se. But it's causing trouble\n>> for me and my team.\n>> My team is currently on Subversion. I'm trying to convince some people\n>> that git is a good way to go.\n>>\n>> So I'm using git-svn. My team tends to commit to the svn server fairly\n>> often. It has happened more than once that, because git svn rebase\n>> applies each svn commit sequentially, some of the commits will\n>> conflict with each other - whether or not I have ever touched the\n\ngit svn rebase fetches all svn commits and then rebases your current\nbranch onto FETCH_HEAD (the last svn commit). In doing so, it applies\nthe commits you have on your branch (since merge base) one by one.\nWhat do you mean by \"applies each svn commit sequentially\"?\n\n>> file. Obviously, this is a big problem because if I've never touched\n>> the file, then I probably won't know exactly how to resolve the merge\n>> (the merge markers haven't been solely reliable).\n\nIf you develop on a local branch and get conflicts with others' commits\nsomeone has to resolve them, whether you use git or svn. But I'm\nsurprised there are conflicts in files you didn't touch. Can you share\nmore details on the files or the workflow/repo?\n\nMichael\n"}]}