{"thread":{"id":"757","subject":"Problem with cg-merge","startedAt":"2005-05-29T15:04:52Z","lastAt":"2005-05-29T22:58:57Z","messageCount":10,"participants":["Marcel Holtmann","Sean","Jonas Fonseca","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"4170","messageId":"1117379092.7072.90.camel@pegasus","threadId":"757","inReplyTo":null,"subject":"Problem with cg-merge","fromName":"Marcel Holtmann","fromEmail":"marcel@holtmann.org","sentAt":"2005-05-29T15:04:52Z","receivedAt":"2005-05-29T15:04:52Z","isPatch":false,"sender":{"key":"marcel@holtmann.org","avatar":null},"body":"Hi Petr,\n\nI saw that earlier, but I don't have any idea what's wrong here. If I do\na simple cg-update, I see something like this:\n\nTree change: cf1f29d97210d0594dcf5b2a734bdb714de6bf24:89a14a5bd2c880095d5c618a102319bb3dc03da9\n:100755 100755 ceda2c50fc2c2941daa34a57722df251bf892c38 fea239b99d351502d1acb098abd725557f0af202 M      cg-diff\n:100755 100755 cc0c17beef75db41da3ad4ef8983bd7e222ac739 5f0bff77eb2110d52892793e5bef104acde7be32 M      cg-help\n\nApplying changes...\nFast-forwarding cf1f29d97210d0594dcf5b2a734bdb714de6bf24 -> 89a14a5bd2c880095d5c618a102319bb3dc03da9\n        on top of cf1f29d97210d0594dcf5b2a734bdb714de6bf24...\npatching file cg-diff\npatching file cg-help\ncg-diff: needs update\ncg-help: needs update\n\nThis is a little bit odd, because if I call \"git-diff-cache HEAD\" after\nit, I will see that cg-diff and cg-help are modified. After calling\ncg-cancel everything looks fine again.\n\nRegards\n\nMarcel\n\n\n"},{"id":"4174","messageId":"3798.10.10.10.24.1117384256.squirrel@linux1","threadId":"757","inReplyTo":"1117379092.7072.90.camel@pegasus","subject":"Re: Problem with cg-merge","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2005-05-29T16:30:56Z","receivedAt":"2005-05-29T16:30:56Z","isPatch":false,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"On Sun, May 29, 2005 11:04 am, Marcel Holtmann said:\n> Hi Petr,\n>\n> I saw that earlier, but I don't have any idea what's wrong here. If I do\n> a simple cg-update, I see something like this:\n>\n> Tree change:\n> cf1f29d97210d0594dcf5b2a734bdb714de6bf24:89a14a5bd2c880095d5c618a102319bb3dc03da9\n> :100755 100755 ceda2c50fc2c2941daa34a57722df251bf892c38\n> fea239b99d351502d1acb098abd725557f0af202 M      cg-diff\n> :100755 100755 cc0c17beef75db41da3ad4ef8983bd7e222ac739\n> 5f0bff77eb2110d52892793e5bef104acde7be32 M      cg-help\n>\n> Applying changes...\n> Fast-forwarding cf1f29d97210d0594dcf5b2a734bdb714de6bf24 ->\n> 89a14a5bd2c880095d5c618a102319bb3dc03da9\n>         on top of cf1f29d97210d0594dcf5b2a734bdb714de6bf24...\n> patching file cg-diff\n> patching file cg-help\n> cg-diff: needs update\n> cg-help: needs update\n>\n> This is a little bit odd, because if I call \"git-diff-cache HEAD\" after\n> it, I will see that cg-diff and cg-help are modified. After calling\n> cg-cancel everything looks fine again.\n\nMarcel,\n\nAny chance you've installed a copy of git core in addition to your\noriginal install of Cogito?   That looks like a problem i saw when using a\nnewer git installed overtop of Cogito.\n\nSean\n\n\n"},{"id":"4178","messageId":"20050529180742.GA31388@diku.dk","threadId":"757","inReplyTo":"1117379092.7072.90.camel@pegasus","subject":"Re: Problem with cg-merge","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2005-05-29T18:07:42Z","receivedAt":"2005-05-29T18:07:42Z","isPatch":false,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Marcel Holtmann <marcel@holtmann.org> wrote Sun, May 29, 2005:\n> Hi Petr,\n> \n> I saw that earlier, but I don't have any idea what's wrong here. If I do\n> a simple cg-update, I see something like this:\n> \n> Tree change: cf1f29d97210d0594dcf5b2a734bdb714de6bf24:89a14a5bd2c880095d5c618a102319bb3dc03da9\n> :100755 100755 ceda2c50fc2c2941daa34a57722df251bf892c38 fea239b99d351502d1acb098abd725557f0af202 M      cg-diff\n> :100755 100755 cc0c17beef75db41da3ad4ef8983bd7e222ac739 5f0bff77eb2110d52892793e5bef104acde7be32 M      cg-help\n> \n> Applying changes...\n> Fast-forwarding cf1f29d97210d0594dcf5b2a734bdb714de6bf24 -> 89a14a5bd2c880095d5c618a102319bb3dc03da9\n>         on top of cf1f29d97210d0594dcf5b2a734bdb714de6bf24...\n> patching file cg-diff\n> patching file cg-help\n> cg-diff: needs update\n> cg-help: needs update\n> \n> This is a little bit odd, because if I call \"git-diff-cache HEAD\" after\n> it, I will see that cg-diff and cg-help are modified. After calling\n> cg-cancel everything looks fine again.\n\nThe following change fixes cg-update for me. This is in tree_timewarp().\n\n--- 0ca4ae56fa7bbd8d10e2c2791e389bc19977e460/cg-Xlib  (mode:100755)\n+++ uncommitted/cg-Xlib  (mode:100755)\n@@ -66,7 +66,7 @@\n \t\t# XXX: This may be suboptimal, but it is also non-trivial to keep\n \t\t# the adds/removes properly.  So this is just a quick hack to get it\n \t\t# working without much fuss.\n-\t\tcg-diff -r $branch >$patchfile\n+\t\tcg-diff >$patchfile\n \tfi\n \n \tgit-read-tree -m \"$branch\" || die \"$branch: bad commit\"\n\n-- \nJonas Fonseca\n"},{"id":"4179","messageId":"1117390650.7072.100.camel@pegasus","threadId":"757","inReplyTo":"20050529180742.GA31388@diku.dk","subject":"Re: Problem with cg-merge","fromName":"Marcel Holtmann","fromEmail":"marcel@holtmann.org","sentAt":"2005-05-29T18:17:30Z","receivedAt":"2005-05-29T18:17:30Z","isPatch":false,"sender":{"key":"marcel@holtmann.org","avatar":null},"body":"Hi Jonas,\n\n> > I saw that earlier, but I don't have any idea what's wrong here. If I do\n> > a simple cg-update, I see something like this:\n> > \n> > Tree change: cf1f29d97210d0594dcf5b2a734bdb714de6bf24:89a14a5bd2c880095d5c618a102319bb3dc03da9\n> > :100755 100755 ceda2c50fc2c2941daa34a57722df251bf892c38 fea239b99d351502d1acb098abd725557f0af202 M      cg-diff\n> > :100755 100755 cc0c17beef75db41da3ad4ef8983bd7e222ac739 5f0bff77eb2110d52892793e5bef104acde7be32 M      cg-help\n> > \n> > Applying changes...\n> > Fast-forwarding cf1f29d97210d0594dcf5b2a734bdb714de6bf24 -> 89a14a5bd2c880095d5c618a102319bb3dc03da9\n> >         on top of cf1f29d97210d0594dcf5b2a734bdb714de6bf24...\n> > patching file cg-diff\n> > patching file cg-help\n> > cg-diff: needs update\n> > cg-help: needs update\n> > \n> > This is a little bit odd, because if I call \"git-diff-cache HEAD\" after\n> > it, I will see that cg-diff and cg-help are modified. After calling\n> > cg-cancel everything looks fine again.\n> \n> The following change fixes cg-update for me. This is in tree_timewarp().\n> \n> --- 0ca4ae56fa7bbd8d10e2c2791e389bc19977e460/cg-Xlib  (mode:100755)\n> +++ uncommitted/cg-Xlib  (mode:100755)\n> @@ -66,7 +66,7 @@\n>  \t\t# XXX: This may be suboptimal, but it is also non-trivial to keep\n>  \t\t# the adds/removes properly.  So this is just a quick hack to get it\n>  \t\t# working without much fuss.\n> -\t\tcg-diff -r $branch >$patchfile\n> +\t\tcg-diff >$patchfile\n>  \tfi\n>  \n>  \tgit-read-tree -m \"$branch\" || die \"$branch: bad commit\"\n\nthis looks better now. Petr, please apply this patch.\n\nRegards\n\nMarcel\n\n\n"},{"id":"4180","messageId":"1117390671.7072.102.camel@pegasus","threadId":"757","inReplyTo":"3798.10.10.10.24.1117384256.squirrel@linux1","subject":"Re: Problem with cg-merge","fromName":"Marcel Holtmann","fromEmail":"marcel@holtmann.org","sentAt":"2005-05-29T18:17:51Z","receivedAt":"2005-05-29T18:17:51Z","isPatch":false,"sender":{"key":"marcel@holtmann.org","avatar":null},"body":"Hi Sean,\n\n> > I saw that earlier, but I don't have any idea what's wrong here. If I do\n> > a simple cg-update, I see something like this:\n> >\n> > Tree change:\n> > cf1f29d97210d0594dcf5b2a734bdb714de6bf24:89a14a5bd2c880095d5c618a102319bb3dc03da9\n> > :100755 100755 ceda2c50fc2c2941daa34a57722df251bf892c38\n> > fea239b99d351502d1acb098abd725557f0af202 M      cg-diff\n> > :100755 100755 cc0c17beef75db41da3ad4ef8983bd7e222ac739\n> > 5f0bff77eb2110d52892793e5bef104acde7be32 M      cg-help\n> >\n> > Applying changes...\n> > Fast-forwarding cf1f29d97210d0594dcf5b2a734bdb714de6bf24 ->\n> > 89a14a5bd2c880095d5c618a102319bb3dc03da9\n> >         on top of cf1f29d97210d0594dcf5b2a734bdb714de6bf24...\n> > patching file cg-diff\n> > patching file cg-help\n> > cg-diff: needs update\n> > cg-help: needs update\n> >\n> > This is a little bit odd, because if I call \"git-diff-cache HEAD\" after\n> > it, I will see that cg-diff and cg-help are modified. After calling\n> > cg-cancel everything looks fine again.\n> \n> Any chance you've installed a copy of git core in addition to your\n> original install of Cogito?   That looks like a problem i saw when using a\n> newer git installed overtop of Cogito.\n\nno, I don't.\n\nRegards\n\nMarcel\n\n\n"},{"id":"4184","messageId":"20050529184830.GM1036@pasky.ji.cz","threadId":"757","inReplyTo":"1117390650.7072.100.camel@pegasus","subject":"Re: Problem with cg-merge","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-05-29T18:48:30Z","receivedAt":"2005-05-29T18:48:30Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sun, May 29, 2005 at 08:17:30PM CEST, I got a letter\nwhere Marcel Holtmann <marcel@holtmann.org> told me that...\n> Hi Jonas,\n> \n> > > I saw that earlier, but I don't have any idea what's wrong here. If I do\n> > > a simple cg-update, I see something like this:\n> > > \n> > > Tree change: cf1f29d97210d0594dcf5b2a734bdb714de6bf24:89a14a5bd2c880095d5c618a102319bb3dc03da9\n> > > :100755 100755 ceda2c50fc2c2941daa34a57722df251bf892c38 fea239b99d351502d1acb098abd725557f0af202 M      cg-diff\n> > > :100755 100755 cc0c17beef75db41da3ad4ef8983bd7e222ac739 5f0bff77eb2110d52892793e5bef104acde7be32 M      cg-help\n> > > \n> > > Applying changes...\n> > > Fast-forwarding cf1f29d97210d0594dcf5b2a734bdb714de6bf24 -> 89a14a5bd2c880095d5c618a102319bb3dc03da9\n> > >         on top of cf1f29d97210d0594dcf5b2a734bdb714de6bf24...\n> > > patching file cg-diff\n> > > patching file cg-help\n> > > cg-diff: needs update\n> > > cg-help: needs update\n> > > \n> > > This is a little bit odd, because if I call \"git-diff-cache HEAD\" after\n> > > it, I will see that cg-diff and cg-help are modified. After calling\n> > > cg-cancel everything looks fine again.\n> > \n> > The following change fixes cg-update for me. This is in tree_timewarp().\n> > \n> > --- 0ca4ae56fa7bbd8d10e2c2791e389bc19977e460/cg-Xlib  (mode:100755)\n> > +++ uncommitted/cg-Xlib  (mode:100755)\n> > @@ -66,7 +66,7 @@\n> >  \t\t# XXX: This may be suboptimal, but it is also non-trivial to keep\n> >  \t\t# the adds/removes properly.  So this is just a quick hack to get it\n> >  \t\t# working without much fuss.\n> > -\t\tcg-diff -r $branch >$patchfile\n> > +\t\tcg-diff >$patchfile\n> >  \tfi\n> >  \n> >  \tgit-read-tree -m \"$branch\" || die \"$branch: bad commit\"\n> \n> this looks better now. Petr, please apply this patch.\n\nBah. Well if your imaginary friend in your head told you this is\nobviously just a no-go workaround, (s)he was right for once. You just\nbroke cg-admin-uncommit with this one, the real fix is to tell\ntree_timewarp to rollback the tree (or rather rollforth here ;-). This\nway the right branch of this if will be invoked.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"4190","messageId":"1117396121.7072.106.camel@pegasus","threadId":"757","inReplyTo":"20050529184830.GM1036@pasky.ji.cz","subject":"Re: Problem with cg-merge","fromName":"Marcel Holtmann","fromEmail":"marcel@holtmann.org","sentAt":"2005-05-29T19:48:41Z","receivedAt":"2005-05-29T19:48:41Z","isPatch":false,"sender":{"key":"marcel@holtmann.org","avatar":null},"body":"Hi Petr,\n\n> > > > I saw that earlier, but I don't have any idea what's wrong here. If I do\n> > > > a simple cg-update, I see something like this:\n> > > > \n> > > > Tree change: cf1f29d97210d0594dcf5b2a734bdb714de6bf24:89a14a5bd2c880095d5c618a102319bb3dc03da9\n> > > > :100755 100755 ceda2c50fc2c2941daa34a57722df251bf892c38 fea239b99d351502d1acb098abd725557f0af202 M      cg-diff\n> > > > :100755 100755 cc0c17beef75db41da3ad4ef8983bd7e222ac739 5f0bff77eb2110d52892793e5bef104acde7be32 M      cg-help\n> > > > \n> > > > Applying changes...\n> > > > Fast-forwarding cf1f29d97210d0594dcf5b2a734bdb714de6bf24 -> 89a14a5bd2c880095d5c618a102319bb3dc03da9\n> > > >         on top of cf1f29d97210d0594dcf5b2a734bdb714de6bf24...\n> > > > patching file cg-diff\n> > > > patching file cg-help\n> > > > cg-diff: needs update\n> > > > cg-help: needs update\n> > > > \n> > > > This is a little bit odd, because if I call \"git-diff-cache HEAD\" after\n> > > > it, I will see that cg-diff and cg-help are modified. After calling\n> > > > cg-cancel everything looks fine again.\n> > > \n> > > The following change fixes cg-update for me. This is in tree_timewarp().\n> > > \n> > > --- 0ca4ae56fa7bbd8d10e2c2791e389bc19977e460/cg-Xlib  (mode:100755)\n> > > +++ uncommitted/cg-Xlib  (mode:100755)\n> > > @@ -66,7 +66,7 @@\n> > >  \t\t# XXX: This may be suboptimal, but it is also non-trivial to keep\n> > >  \t\t# the adds/removes properly.  So this is just a quick hack to get it\n> > >  \t\t# working without much fuss.\n> > > -\t\tcg-diff -r $branch >$patchfile\n> > > +\t\tcg-diff >$patchfile\n> > >  \tfi\n> > >  \n> > >  \tgit-read-tree -m \"$branch\" || die \"$branch: bad commit\"\n> > \n> > this looks better now. Petr, please apply this patch.\n> \n> Bah. Well if your imaginary friend in your head told you this is\n> obviously just a no-go workaround, (s)he was right for once. You just\n> broke cg-admin-uncommit with this one, the real fix is to tell\n> tree_timewarp to rollback the tree (or rather rollforth here ;-). This\n> way the right branch of this if will be invoked.\n\nI had no idea if the patch was correct or not, but it was working for\nme. I also tested your fix for it and it works for me and I am happy\nagain.\n\nRegards\n\nMarcel\n\n\n"},{"id":"4196","messageId":"20050529211524.GB32141@diku.dk","threadId":"757","inReplyTo":"20050529184830.GM1036@pasky.ji.cz","subject":"Re: Problem with cg-merge","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2005-05-29T21:15:24Z","receivedAt":"2005-05-29T21:15:24Z","isPatch":false,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Petr Baudis <pasky@ucw.cz> wrote Sun, May 29, 2005:\n> Dear diary, on Sun, May 29, 2005 at 08:17:30PM CEST, I got a letter\n> where Marcel Holtmann <marcel@holtmann.org> told me that...\n> > > --- 0ca4ae56fa7bbd8d10e2c2791e389bc19977e460/cg-Xlib  (mode:100755)\n> > > +++ uncommitted/cg-Xlib  (mode:100755)\n> > > @@ -66,7 +66,7 @@\n> > >  \t\t# XXX: This may be suboptimal, but it is also non-trivial to keep\n> > >  \t\t# the adds/removes properly.  So this is just a quick hack to get it\n> > >  \t\t# working without much fuss.\n> > > -\t\tcg-diff -r $branch >$patchfile\n> > > +\t\tcg-diff >$patchfile\n> > >  \tfi\n> > >  \n> > >  \tgit-read-tree -m \"$branch\" || die \"$branch: bad commit\"\n> > \n> > this looks better now. Petr, please apply this patch.\n> \n> Bah. Well if your imaginary friend in your head told you this is\n> obviously just a no-go workaround, (s)he was right for once. You just\n> broke cg-admin-uncommit with this one, the real fix is to tell\n> tree_timewarp to rollback the tree (or rather rollforth here ;-). This\n> way the right branch of this if will be invoked.\n\nOk, I should have mentioned it was an ugly workaround.\n\nThere is another problem I've noticed in the work on the cogito\nmanpages. To make it easier to update the ``external'' patch I maintain\nI have added the files Documentation/make-cg-asciidoc and\nDocumentation/make-cogito-asciidoc but not actually committed them.\nThat way cg-diff will include them (diffed against /dev/null) which I\nlike very much. However, when I cg-update from my local cogito origin\ncg-merge will fast-forward using cg-diff which results in rejects when\npatching the local changes due to the files already existing.\n\nOne possibility would be to revert all local changes with the patch\ngenerated by cg-diff since most of them will be overwritten anyway.\nThis would remove uncommitted added files but it would probably require\nuse of the GIT metadata to get the fast-forwarding right with modes\nintact.\n\n-- \nJonas Fonseca\n"},{"id":"4202","messageId":"20050529224042.GV1036@pasky.ji.cz","threadId":"757","inReplyTo":"20050529211524.GB32141@diku.dk","subject":"Re: Problem with cg-merge","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-05-29T22:40:42Z","receivedAt":"2005-05-29T22:40:42Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sun, May 29, 2005 at 11:15:24PM CEST, I got a letter\nwhere Jonas Fonseca <fonseca@diku.dk> told me that...\n> There is another problem I've noticed in the work on the cogito\n> manpages. To make it easier to update the ``external'' patch I maintain\n> I have added the files Documentation/make-cg-asciidoc and\n> Documentation/make-cogito-asciidoc but not actually committed them.\n> That way cg-diff will include them (diffed against /dev/null) which I\n> like very much. However, when I cg-update from my local cogito origin\n> cg-merge will fast-forward using cg-diff which results in rejects when\n> patching the local changes due to the files already existing.\n> \n> One possibility would be to revert all local changes with the patch\n> generated by cg-diff since most of them will be overwritten anyway.\n> This would remove uncommitted added files but it would probably require\n> use of the GIT metadata to get the fast-forwarding right with modes\n> intact.\n\nI'm confused. Are you suggesting that we just throw away any local\nchanges when updating? That sounds horrible - it's something the user\nhas full right not to expect and I'd be very careful about it.\n\nIn the longer term we shouldn't muck with diff | patch but instead do a\nthree-way merge on the local changes too.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"4203","messageId":"20050529225857.GA10715@diku.dk","threadId":"757","inReplyTo":"20050529224042.GV1036@pasky.ji.cz","subject":"Re: Problem with cg-merge","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2005-05-29T22:58:57Z","receivedAt":"2005-05-29T22:58:57Z","isPatch":false,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Petr Baudis <pasky@ucw.cz> wrote Mon, May 30, 2005:\n> Dear diary, on Sun, May 29, 2005 at 11:15:24PM CEST, I got a letter\n> where Jonas Fonseca <fonseca@diku.dk> told me that...\n> > There is another problem I've noticed in the work on the cogito\n> > manpages. To make it easier to update the ``external'' patch I maintain\n> > I have added the files Documentation/make-cg-asciidoc and\n> > Documentation/make-cogito-asciidoc but not actually committed them.\n> > That way cg-diff will include them (diffed against /dev/null) which I\n> > like very much. However, when I cg-update from my local cogito origin\n> > cg-merge will fast-forward using cg-diff which results in rejects when\n> > patching the local changes due to the files already existing.\n> > \n> > One possibility would be to revert all local changes with the patch\n> > generated by cg-diff since most of them will be overwritten anyway.\n> > This would remove uncommitted added files but it would probably require\n> > use of the GIT metadata to get the fast-forwarding right with modes\n> > intact.\n> \n> I'm confused. Are you suggesting that we just throw away any local\n> changes when updating? That sounds horrible - it's something the user\n> has full right not to expect and I'd be very careful about it.\n\nForget what I suggested. The current way to cg-diff then update the tree\nand apply the local changes on top of that does handled locally added\nbut uncommited files.\n\n> In the longer term we shouldn't muck with diff | patch but instead do a\n> three-way merge on the local changes too.\n\nYes, that sounds nice.\n\n-- \nJonas Fonseca\n"}]}