{"thread":{"id":"29598","subject":"git svn problem","startedAt":"2012-02-10T18:15:55Z","lastAt":"2012-02-11T10:19:43Z","messageCount":4,"participants":["Serhat Sevki Dincer","Sam Vilain"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"184373","messageId":"CAPqC6xRtZXwv+U6AKRUXDz=m-G4AjgWksbwqeMD_qzS8YC=DoQ@mail.gmail.com","threadId":"29598","inReplyTo":null,"subject":"git svn problem","fromName":"Serhat Sevki Dincer","fromEmail":"jfcgauss@gmail.com","sentAt":"2012-02-10T18:15:55Z","receivedAt":"2012-02-10T18:15:55Z","isPatch":false,"sender":{"key":"jfcgauss@gmail.com","avatar":null},"body":"Hi,\n\nI am using git-svn (1.7.4.1-3 on ubuntu) to get a project. It has two\nsvn repositories, apparently disjoint. First half is at\nhttp://svn.plone.org/svn/plone/plone.app.locales, and the continuation\nat http://svn.plone.org/svn/collective/plone.app.locales\nHow can i get a nice linear git-svn repository? the second one is the\nnew location of the project. I am only interested in the trunks btw.\n\nThanks..\n"},{"id":"184398","messageId":"4F358A53.8010409@vilain.net","threadId":"29598","inReplyTo":"CAPqC6xRtZXwv+U6AKRUXDz=m-G4AjgWksbwqeMD_qzS8YC=DoQ@mail.gmail.com","subject":"Re: git svn problem","fromName":"Sam Vilain","fromEmail":"sam@vilain.net","sentAt":"2012-02-10T21:21:23Z","receivedAt":"2012-02-10T21:21:23Z","isPatch":false,"sender":{"key":"sam@vilain.net","avatar":"https://gravatar.com/avatar/8fc840ca854dbf6f7065b4335e3b934951c1dca3b11db688e95e471901f8f4a8?d=mp&s=160"},"body":"On 2/10/12 10:15 AM, Serhat Sevki Dincer wrote:\n> Hi,\n>\n> I am using git-svn (1.7.4.1-3 on ubuntu) to get a project. It has two\n> svn repositories, apparently disjoint. First half is at\n> http://svn.plone.org/svn/plone/plone.app.locales, and the continuation\n> at http://svn.plone.org/svn/collective/plone.app.locales\n> How can i get a nice linear git-svn repository? the second one is the\n> new location of the project. I am only interested in the trunks btw.\n\nImport them separately to different git-svn remotes, and once they are \nin the same repository you can graft them together using \n.git/info/grafts (see man gitrepository-layout).  Once it looks right \n(check using 'gitk' etc), make it permanent using git filter-branch. \nYou'll also want to remove the .git/svn directory, and re–run 'git svn \nfetch' so that git svn's revision database is recomputed.  Don't forget \nthe -A option to 'git svn fetch'!\n\nGood luck,\nSam\n"},{"id":"184416","messageId":"CAPqC6xSJ7pfUQJz8FQ743mJMNmZyfJfWxutOnt+FVkP76eXOGw@mail.gmail.com","threadId":"29598","inReplyTo":"4F358A53.8010409@vilain.net","subject":"Re: git svn problem","fromName":"Serhat Sevki Dincer","fromEmail":"jfcgauss@gmail.com","sentAt":"2012-02-11T00:52:50Z","receivedAt":"2012-02-11T00:52:50Z","isPatch":false,"sender":{"key":"jfcgauss@gmail.com","avatar":null},"body":"On Fri, Feb 10, 2012 at 11:21 PM, Sam Vilain <sam@vilain.net> wrote:\n> Import them separately to different git-svn remotes, and once they are in\n> the same repository you can graft them together using .git/info/grafts (see\n> man gitrepository-layout).  Once it looks right (check using 'gitk' etc),\n> make it permanent using git filter-branch. You'll also want to remove the\n> .git/svn directory, and re–run 'git svn fetch' so that git svn's revision\n> database is recomputed.  Don't forget the -A option to 'git svn fetch'!\n\nThat sounds too complicated. There should be an easier way (i hope:)\nI have the following at the moment:\n\nrm -rf plone.app.locales ; mkdir plone.app.locales ; cd plone.app.locales\ngit svn init -T trunk http://svn.plone.org/svn/plone/plone.app.locales\ntouch start ; git add start ; git commit -m start\ngit svn fetch -r49624:HEAD\ngit rebase --onto master --root trunk --preserve-merges\ngit checkout -b plone\n\nplone branch looks good, now I would like to do the same with\ncollective/plone.app.locales. I tried a couple of things but ended up\ngetting errors like:\n\nRebuilding .git/svn/refs/remotes/trunk/.rev_map.db7f04ef-aaf3-0310-a811-c281ed44c4ad\n...\nDone rebuilding\n.git/svn/refs/remotes/trunk/.rev_map.db7f04ef-aaf3-0310-a811-c281ed44c4ad\nRA layer request failed: REPORT of '/svn/collective/!svn/vcc/default':\nCould not read chunk size: connection was closed by server\n(http://svn.plone.org) at /usr/lib/git-core/git-svn line 5131\n\nIs there some way around these errors?\n\nThanks..\nSerhat\n"},{"id":"184448","messageId":"CAPqC6xR9LFgx4r1t0misYavPe8sky=VJf39N29CU-66Re7zL-Q@mail.gmail.com","threadId":"29598","inReplyTo":"CAPqC6xSJ7pfUQJz8FQ743mJMNmZyfJfWxutOnt+FVkP76eXOGw@mail.gmail.com","subject":"Re: git svn problem","fromName":"Serhat Sevki Dincer","fromEmail":"jfcgauss@gmail.com","sentAt":"2012-02-11T10:19:43Z","receivedAt":"2012-02-11T10:19:43Z","isPatch":false,"sender":{"key":"jfcgauss@gmail.com","avatar":null},"body":"Ok, I figured out the rest, in case someone needs it:\n\n> I have the following at the moment:\n>\n> rm -rf plone.app.locales ; mkdir plone.app.locales ; cd plone.app.locales\n> git svn init -T trunk http://svn.plone.org/svn/plone/plone.app.locales\n> touch start ; git add start ; git commit -m start\n> git svn fetch -r49624:HEAD\n> git rebase --onto master --root trunk --preserve-merges\n> git checkout -b plone\n\n# edit .git/config: s#/plone/#/collective/#  s#remotes/trunk#remotes/trunkcol#\n\ngit checkout master\ngit svn fetch -r248302:HEAD\ngit rebase --onto plone --root trunkcol --preserve-merges\ngit checkout -b collective\ngit branch -d master plone\n"}]}