{"thread":{"id":"8855","subject":"git-svn dcommit fail","startedAt":"2007-07-04T09:56:33Z","lastAt":"2007-07-05T16:18:54Z","messageCount":6,"participants":["Dongsheng Song","Steven Grimm","Kees-Jan Dijkzeul","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"46457","messageId":"4b3406f0707040256x31f0909cie126d950c60374f1@mail.gmail.com","threadId":"8855","inReplyTo":null,"subject":"git-svn dcommit fail","fromName":"Dongsheng Song","fromEmail":"dongsheng.song@gmail.com","sentAt":"2007-07-04T09:56:33Z","receivedAt":"2007-07-04T09:56:33Z","isPatch":false,"sender":{"key":"dongsheng.song@gmail.com","avatar":null},"body":"After some merge operation,\n\n$ git-svn rebase\nCurrent branch master is up to date.\n$ git-svn dcommit\nUnable to extract revision information from commit\nf10ff0772f96ec434b27d47efaee082190bb8516~1\n\nThanks for some help.\n\n---\nDongsheng\n"},{"id":"46534","messageId":"468C999C.60701@midwinter.com","threadId":"8855","inReplyTo":"4b3406f0707040256x31f0909cie126d950c60374f1@mail.gmail.com","subject":"Re: git-svn dcommit fail","fromName":"Steven Grimm","fromEmail":"koreth@midwinter.com","sentAt":"2007-07-05T07:11:24Z","receivedAt":"2007-07-05T07:11:24Z","isPatch":false,"sender":{"key":"koreth@midwinter.com","avatar":"https://gravatar.com/avatar/71b4d2e8b62f168bdc9e9205341159e3567003b4f9e2127c617c5fa0a1f5bad2?d=mp&s=160"},"body":"Dongsheng Song wrote:\n> After some merge operation,\n\ngit-svn doesn't support nonlinear history in any of the official \nreleases, though there will be some support in the next release (you can \ntry it out by grabbing the latest version from git.git's master branch). \nIf you don't want to run a prerelease version of git, you need to avoid \ndoing non-squash merges into branches that you are going to check into \nan svn repository.\n\nSquash merges (git merge --squash) work fine, though. They will be \nrecorded in your history as a regular commit, not a merge, so git-svn \nwon't be confused by them.\n\n-Steve\n"},{"id":"46536","messageId":"fa0b6e200707050128h6bc3caa4rd661c64128ac7367@mail.gmail.com","threadId":"8855","inReplyTo":"fa0b6e200707050126m17a23de6uad4909533306eb06@mail.gmail.com","subject":"Fwd: git-svn dcommit fail","fromName":"Kees-Jan Dijkzeul","fromEmail":"k.j.dijkzeul@gmail.com","sentAt":"2007-07-05T08:28:57Z","receivedAt":"2007-07-05T08:28:57Z","isPatch":false,"sender":{"key":"k.j.dijkzeul@gmail.com","avatar":"https://gravatar.com/avatar/7093ca9ddb281f666728c9863ed26183dc72ff01d7fd509b053b7e089a93ffcb?d=mp&s=160"},"body":"This one should have gone to the list. Sorry, Steven, for mailing privately.\n\n---------- Forwarded message ----------\nFrom: Kees-Jan Dijkzeul \nDate: Jul 5, 2007 10:26 AM\nSubject: Re: git-svn dcommit fail\nTo: Steven Grimm \n\n\nOn 7/5/07, Steven Grimm wrote:\n> git-svn doesn't support nonlinear history in any of the official\n> releases, though there will be some support in the next release (you can\n> try it out by grabbing the latest version from git.git's master branch).\n\nI just fetched the master branch. For me it is at commit\nd44c782bbd6b0e806e056f9e8ff8cd8e426e67a3.\nAt this point, git-svn is identical to the one in 1.5.2.3.\n\nI've attempted to use git to merge two subversion branches, but when\ndcommitting attempts to commit the correct delta to the wrong branch,\nand subsequently claims that \"Your file or directory is probably out\nof date\" (which, in a weird way, makes sense).\n\nI'd be happy to test this support for nonlinear history, but so far,\nI've been unable to locate the correct commit.\n\nGroetjes,\n\nKees-Jan\n"},{"id":"46537","messageId":"7v1wfndyow.fsf@assigned-by-dhcp.cox.net","threadId":"8855","inReplyTo":"fa0b6e200707050128h6bc3caa4rd661c64128ac7367@mail.gmail.com","subject":"Re: Fwd: git-svn dcommit fail","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-07-05T08:47:27Z","receivedAt":"2007-07-05T08:47:27Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Kees-Jan Dijkzeul\" writes:\n\n> I just fetched the master branch. For me it is at commit\n> d44c782bbd6b0e806e056f9e8ff8cd8e426e67a3.\n\nYou must be kiding. That was made on Jun 6, 2007, which is\nancient if not prehistoric in git timescale.\n\nCould you double check?\n"},{"id":"46539","messageId":"fa0b6e200707050406i831816co80ff1500dae6bf54@mail.gmail.com","threadId":"8855","inReplyTo":"7v1wfndyow.fsf@assigned-by-dhcp.cox.net","subject":"Re: Fwd: git-svn dcommit fail","fromName":"Kees-Jan Dijkzeul","fromEmail":"k.j.dijkzeul@gmail.com","sentAt":"2007-07-05T11:06:21Z","receivedAt":"2007-07-05T11:06:21Z","isPatch":false,"sender":{"key":"k.j.dijkzeul@gmail.com","avatar":"https://gravatar.com/avatar/7093ca9ddb281f666728c9863ed26183dc72ff01d7fd509b053b7e089a93ffcb?d=mp&s=160"},"body":"On 7/5/07, Junio C Hamano wrote:\n> Could you double check?\n\n*Blush*. I should have caught that one myself. I'm now at commit\n114fd812f78ea375ee6782d4ff0203f3ae20b076, which still exhibits the\nsame problem.\n\nBasically, the problem is as follows: My head commit is a merge:\n$ git show HEAD\ncommit e135f26dbae66f539b486646a12aa51e71c196a1\nMerge: bb8ac98... f453e1e...\n\nBoth parents are svn-commits.\n\nWhen I do a dry-run, I get\n$ git-svn dcommit -n\ndiff-tree e135f26dbae66f539b486646a12aa51e71c196a1~1\ne135f26dbae66f539b486646a12aa51e71c196a1\n\nAs far as I'm concerned, this is correct. This is the delta that\nshould be committed to the svn branch who's head is\ne135f26dbae66f539b486646a12aa51e71c196a1~1 (obviously).\n\nHowever, function \"working_head_info\" of git-svn returns the other\nparent as the working head. As a result, committing the diff to svn\nfails.\n\nI've observed that the call to cmt_metadata(\"$d~1\") (line 382 of\ngit-svn) does return the correct svn branch, so it would seem to me\nthat it makes much more sense to commit to that.\n\nAny thoughts, tips, tricks?\n\nThanks!\n\nKees-Jan\n"},{"id":"46553","messageId":"468D19EE.6@midwinter.com","threadId":"8855","inReplyTo":"fa0b6e200707050406i831816co80ff1500dae6bf54@mail.gmail.com","subject":"Re: Fwd: git-svn dcommit fail","fromName":"Steven Grimm","fromEmail":"koreth@midwinter.com","sentAt":"2007-07-05T16:18:54Z","receivedAt":"2007-07-05T16:18:54Z","isPatch":false,"sender":{"key":"koreth@midwinter.com","avatar":"https://gravatar.com/avatar/71b4d2e8b62f168bdc9e9205341159e3567003b4f9e2127c617c5fa0a1f5bad2?d=mp&s=160"},"body":"Kees-Jan Dijkzeul wrote:\n> Basically, the problem is as follows: My head commit is a merge:\n> $ git show HEAD\n> commit e135f26dbae66f539b486646a12aa51e71c196a1\n> Merge: bb8ac98... f453e1e...\n>\n> Both parents are svn-commits.\n\nThat seems to be a case that the current merge support in git-svn can't \nhandle. I'll refer you to the test I did when the merge support first \nlanded on the mailing list:\n\nhttp://www.spinics.net/lists/git/msg33628.html\n\nThe current code seems to be aimed at using branches for local \ndevelopment on the git side rather than dealing with relationships \nbetween multiple svn branches.\n\nI'll also point out this utility, which may be of use to you. It is not \nperfect but it works.\n\nhttp://www.spinics.net/lists/git/msg29119.html\n\n-Steve\n"}]}