{"thread":{"id":"6265","subject":"troubles in supersede old development history (git-svn)","startedAt":"2007-01-07T09:29:58Z","lastAt":"2007-01-08T02:44:28Z","messageCount":2,"participants":["Songmao Tian","Eric Wong"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"31024","messageId":"7d73e7d80701070129r48dfa3bcq46112dea56962b3e@mail.gmail.com","threadId":"6265","inReplyTo":null,"subject":"troubles in supersede old development history (git-svn)","fromName":"Songmao Tian","fromEmail":"kingkongmao@gmail.com","sentAt":"2007-01-07T09:29:58Z","receivedAt":"2007-01-07T09:29:58Z","isPatch":false,"sender":{"key":"kingkongmao@gmail.com","avatar":null},"body":"our trunk's maintainer is lazy in merging branches, I'd like to merge\nthe branch kkmao, and now there are so many the conflicts. I want to\njust use my version and overcome all the conflicts.\n\ni try in this way:\n\ngit-checkout -b trunk remotes/trunk\ngit-rebase --merge -s ours remotes/kkmao\ngit-svn dcommit -i trunk\ndiff-tree 9b75e30191838431810aec4eda98482a8d6935ed~1\n9b75e30191838431810aec4eda98482a8d6935ed\nTransaction is out of date: Out of date:\n'trunk/Targets/Bonito/conf/Bonito.lmbox' in transaction '74-3' at\n/home/kkmao/bin/git-svn line 1577\n\nso what's the solution?\n\n\nand another question. I use normal merge strategy\ngit-svn remotes/kkmao\ngot some conflicts..\n\nand one file is missing, i have to git-ls-files -u to see what's beneath.\ngit-ls-files -u\n100644 f7a66ae00d4034ab580e4ee71b0eaccc3a3e44e7 1\nTargets/Bonito/conf/Bonito\n100644 e6f5d90b30c3ee694acd2199a03e8f34ef1412ac 3\nTargets/Bonito/conf/Bonito\n\nI have read some doc, but I think I am still not good at resolve conflict:)\n"},{"id":"31110","messageId":"20070108024428.GD10933@localdomain","threadId":"6265","inReplyTo":"7d73e7d80701070129r48dfa3bcq46112dea56962b3e@mail.gmail.com","subject":"Re: troubles in supersede old development history (git-svn)","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-01-08T02:44:28Z","receivedAt":"2007-01-08T02:44:28Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Songmao Tian <kingkongmao@gmail.com> wrote:\n> our trunk's maintainer is lazy in merging branches, I'd like to merge\n> the branch kkmao, and now there are so many the conflicts. I want to\n> just use my version and overcome all the conflicts.\n> \n> i try in this way:\n> \n> git-checkout -b trunk remotes/trunk\n> git-rebase --merge -s ours remotes/kkmao\n> git-svn dcommit -i trunk\n> diff-tree 9b75e30191838431810aec4eda98482a8d6935ed~1\n> 9b75e30191838431810aec4eda98482a8d6935ed\n> Transaction is out of date: Out of date:\n> 'trunk/Targets/Bonito/conf/Bonito.lmbox' in transaction '74-3' at\n> /home/kkmao/bin/git-svn line 1577\n> \n> so what's the solution?\n\nProbably obvious, but is remotes/trunk up-to-date with git-svn fetch?\n\nNext, can you ensure that the tree referenced by\n9b75e30191838431810aec4eda98482a8d6935ed~1 (note the ~1) is the same\nas remotes/trunk?\n(git diff 9b75e30191838431810aec4eda98482a8d6935ed~1 remotes/trunk)\n\nUnfortunately, I'm not familiar with how the 'ours' strategy works with\nrebase --merge.  I generally use the default recursive.  Can you look\nat the history in gitk to see if the history from refs/remotes/trunk\nto refs/heads/trunk is linear?\n\n> and another question. I use normal merge strategy\n> git-svn remotes/kkmao\n> got some conflicts..\n> \n> and one file is missing, i have to git-ls-files -u to see what's beneath.\n> git-ls-files -u\n> 100644 f7a66ae00d4034ab580e4ee71b0eaccc3a3e44e7 1\n> Targets/Bonito/conf/Bonito\n> 100644 e6f5d90b30c3ee694acd2199a03e8f34ef1412ac 3\n> Targets/Bonito/conf/Bonito\n> \n> I have read some doc, but I think I am still not good at resolve conflict:)\n\nJust look at the file in question; edit it and resolve\nthe conflicts in it and then git commit <conflicted files>\n\n-- \nEric Wong\n"}]}