{"thread":{"id":"1239","subject":"Local cg-pull fails","startedAt":"2005-07-14T10:12:25Z","lastAt":"2005-07-22T23:22:19Z","messageCount":2,"participants":["Russell King","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"6130","messageId":"20050714111224.B31383@flint.arm.linux.org.uk","threadId":"1239","inReplyTo":null,"subject":"Local cg-pull fails","fromName":"Russell King","fromEmail":"rmk@arm.linux.org.uk","sentAt":"2005-07-14T10:12:25Z","receivedAt":"2005-07-14T10:12:25Z","isPatch":false,"sender":{"key":"rmk@arm.linux.org.uk","avatar":null},"body":"I think I posted about this before, but I can't find it in my git\nmailbox...\n\nrmk@dyn-67:[linux-2.6-arm] $ cg-update origin\nl\n`../linux-2.6/.git/refs/heads/master' -> `.git/refs/heads/origin'\ncp: cannot create link `.git/objects/00/ae0c9f3bc24856e7c9fcdf690466f1bbe0a4df': File exists\ncp: cannot create link `.git/objects/01/5bd2cf869f70ec708558f1d37980a8b4968604': File exists\ncp: cannot create link `.git/objects/02/c7e335d3ef3998dfb49673654152fb10124d2f': File exists\n\nConsider this flow of changes (which represents how I work):\n\n        Linus' kernel.org tree --> Local pristine tree\n                ^   ^                |            |\n                |   |                v            v\n                |   |        working tree 1   working tree 2\n                |   |                |            |\n                |   `----------------'            |\n                `---------------------------------'\n\nChanges are made in working tree 1, and made available to Linus.  Linus\nmerges them into his tree.  I pull them into the pristine tree.  Assume\nother changes occurred. in Linus' tree.\n\nThe pristine tree is obviously a superset of the working tree.\n\nWhat happens when I pull those changes back into working tree 1, given\nthat cogito uses \"cp -va -ul\".\n\nThe pristine tree now contains the GIT objects which I created in tree 1.\nFor whatever reason I don't understand, they are dated after the same\nobjects in tree 1.  Therefore, because of `-u', cp will want to update\nthem - by replacing the object with a link.  It refuses.\n\nLast time this was discussed, someone suggested -f, which solved the\nproblem.  Can we please modify the cg-pull script to use -f ?\n\nSecondly, can I suggest that cogito developers consider the above\nusage scenario and construct a regression test for it to ensure that\nfuture breakages of this nature are caught.  For me, cogito has been\nextremely fragile, and I don't think the above usage is unreasonable.\n\n-- \nRussell King\n"},{"id":"6343","messageId":"20050722232218.GO11916@pasky.ji.cz","threadId":"1239","inReplyTo":"20050714111224.B31383@flint.arm.linux.org.uk","subject":"Re: Local cg-pull fails","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-07-22T23:22:19Z","receivedAt":"2005-07-22T23:22:19Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Thu, Jul 14, 2005 at 12:12:25PM CEST, I got a letter\nwhere Russell King <rmk@arm.linux.org.uk> told me that...\n> Last time this was discussed, someone suggested -f, which solved the\n> problem.  Can we please modify the cg-pull script to use -f ?\n\nThanks, done.\n\n> Secondly, can I suggest that cogito developers consider the above\n> usage scenario and construct a regression test for it to ensure that\n> future breakages of this nature are caught.  For me, cogito has been\n> extremely fragile, and I don't think the above usage is unreasonable.\n\nDone.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nIf you want the holes in your knowledge showing up try teaching\nsomeone.  -- Alan Cox\n"}]}