{"thread":{"id":"16122","subject":"git/lib and git/git-gui/lib merge mis-hap?","startedAt":"2008-11-01T19:30:08Z","lastAt":"2008-11-03T10:27:10Z","messageCount":5,"participants":["Andreas Ericsson","Shawn O. Pearce","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"94579","messageId":"490CAE40.4060300@op5.se","threadId":"16122","inReplyTo":null,"subject":"git/lib and git/git-gui/lib merge mis-hap?","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2008-11-01T19:30:08Z","receivedAt":"2008-11-01T19:30:08Z","isPatch":false,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Settling down to get some libgit2 hacking done (adding build-rules\nto git.git), I noticed that there's a file in git.git called\nlib/remote_add.tcl, which looks as if it belongs in git-gui/lib.\n\nI don't know how this happened, but since I assume it's subtree\nmerged (thus requiring more work to correct than a simple patch),\nit would be nifty if it could get corrected so as to make space\nfor the up-and-coming git library :-)\n\n-- \nAndreas Ericsson andreas.ericsson@op5.se\nOP5 AB www.op5.se\nTel: +46 8-230225 Fax: +46 8-230231\n"},{"id":"94587","messageId":"20081101202201.GA15463@spearce.org","threadId":"16122","inReplyTo":"490CAE40.4060300@op5.se","subject":"Re: git/lib and git/git-gui/lib merge mis-hap?","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-11-01T20:22:01Z","receivedAt":"2008-11-01T20:22:01Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Andreas Ericsson wrote:\n> Settling down to get some libgit2 hacking done (adding build-rules\n> to git.git), I noticed that there's a file in git.git called\n> lib/remote_add.tcl, which looks as if it belongs in git-gui/lib.\n>\n> I don't know how this happened, but since I assume it's subtree\n> merged (thus requiring more work to correct than a simple patch),\n> it would be nifty if it could get corrected so as to make space\n> for the up-and-coming git library :-)\n\nThat was a bad merge of git-gui on my part. I thought it was fixed.\nIt only happened in next, and was there only for a day before\nsomeone pointed it out to me, and I fixed it in the tree.\n\nFWIW, \"git mv lib/remote_add.tcl git-gui/lib\" is all you need to\nfix it. There's nothing special about the subtree merge.\n\n-- \nShawn.\n"},{"id":"94599","messageId":"7vljw33vz5.fsf@gitster.siamese.dyndns.org","threadId":"16122","inReplyTo":"20081101202201.GA15463@spearce.org","subject":"Re: git/lib and git/git-gui/lib merge mis-hap?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-11-01T22:46:54Z","receivedAt":"2008-11-01T22:46:54Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" writes:\n\n> Andreas Ericsson wrote:\n>> Settling down to get some libgit2 hacking done (adding build-rules\n>> to git.git), I noticed that there's a file in git.git called\n>> lib/remote_add.tcl, which looks as if it belongs in git-gui/lib.\n>>\n>> I don't know how this happened, but since I assume it's subtree\n>> merged (thus requiring more work to correct than a simple patch),\n>> it would be nifty if it could get corrected so as to make space\n>> for the up-and-coming git library :-)\n>\n> That was a bad merge of git-gui on my part. I thought it was fixed.\n> It only happened in next, and was there only for a day before\n> someone pointed it out to me, and I fixed it in the tree.\n\nYou seem to have further changes to the master branch of git-gui. Would\nit be a good time to pull for me? The same question goes to maint as\nwell.\n"},{"id":"94604","messageId":"20081101231432.GE15463@spearce.org","threadId":"16122","inReplyTo":"7vljw33vz5.fsf@gitster.siamese.dyndns.org","subject":"Re: git/lib and git/git-gui/lib merge mis-hap?","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-11-01T23:14:32Z","receivedAt":"2008-11-01T23:14:32Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano wrote:\n> \n> You seem to have further changes to the master branch of git-gui. Would\n> it be a good time to pull for me? The same question goes to maint as\n> well.\n\nYup. I was getting ready to ask you to pull.\n\nCan you pull maint and master?\n\n:-)\n\n-- \nShawn.\n"},{"id":"94745","messageId":"490ED1FE.2000209@op5.se","threadId":"16122","inReplyTo":"20081101202201.GA15463@spearce.org","subject":"Re: git/lib and git/git-gui/lib merge mis-hap?","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2008-11-03T10:27:10Z","receivedAt":"2008-11-03T10:27:10Z","isPatch":false,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Shawn O. Pearce wrote:\n> Andreas Ericsson wrote:\n>> Settling down to get some libgit2 hacking done (adding build-rules\n>> to git.git), I noticed that there's a file in git.git called\n>> lib/remote_add.tcl, which looks as if it belongs in git-gui/lib.\n>>\n>> I don't know how this happened, but since I assume it's subtree\n>> merged (thus requiring more work to correct than a simple patch),\n>> it would be nifty if it could get corrected so as to make space\n>> for the up-and-coming git library :-)\n> \n> That was a bad merge of git-gui on my part. I thought it was fixed.\n> It only happened in next, and was there only for a day before\n> someone pointed it out to me, and I fixed it in the tree.\n> \n> FWIW, \"git mv lib/remote_add.tcl git-gui/lib\" is all you need to\n> fix it. There's nothing special about the subtree merge.\n> \n\nI just pulled latest next, and it's fixed now. Thanks.\n\n-- \nAndreas Ericsson andreas.ericsson@op5.se\nOP5 AB www.op5.se\nTel: +46 8-230225 Fax: +46 8-230231\n"}]}