{"thread":{"id":"1601","subject":"cg-update question.","startedAt":"2005-08-21T07:17:42Z","lastAt":"2005-09-12T00:02:10Z","messageCount":2,"participants":["Johnny Stenback","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"7600","messageId":"43082A96.1070700@mozilla.org","threadId":"1601","inReplyTo":null,"subject":"cg-update question.","fromName":"Johnny Stenback","fromEmail":"jst@mozilla.org","sentAt":"2005-08-21T07:17:42Z","receivedAt":"2005-08-21T07:17:42Z","isPatch":false,"sender":{"key":"jst@mozilla.org","avatar":null},"body":"Hi all,\n\nI hope it's ok to ask cogito questions on this list...\n\nI just realized that if I've got an uncommitted local change in a tree \nand I update my tree with cg-update to merge in changes from a different \ntree... cg-update will pull the changes and do the merge. So that's all \ncool, but as it does the merge, it will re-write my local file that has \nthe uncommitted change, even if that file didn't change in the \nrepository I pulled from, i.e. nothing to merge for that file.\n\nThis is, to me at least, not the desired behavior, if there's no reason \nfor cg-update to touch a file it shouldn't.\n\nThoughts? If someone points me in the right direction I'm willing to \ntake a stab at fixing this myself...\n\n-- \njst\n"},{"id":"8340","messageId":"20050912000210.GA15630@pasky.or.cz","threadId":"1601","inReplyTo":"43082A96.1070700@mozilla.org","subject":"Re: cg-update question.","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-09-12T00:02:10Z","receivedAt":"2005-09-12T00:02:10Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sun, Aug 21, 2005 at 09:17:42AM CEST, I got a letter\nwhere Johnny Stenback <jst@mozilla.org> told me that...\n> Hi all,\n\nHello,\n\n> I just realized that if I've got an uncommitted local change in a tree \n> and I update my tree with cg-update to merge in changes from a different \n> tree... cg-update will pull the changes and do the merge. So that's all \n> cool, but as it does the merge, it will re-write my local file that has \n> the uncommitted change, even if that file didn't change in the \n> repository I pulled from, i.e. nothing to merge for that file.\n> \n> This is, to me at least, not the desired behavior, if there's no reason \n> for cg-update to touch a file it shouldn't.\n> \n> Thoughts? If someone points me in the right direction I'm willing to \n> take a stab at fixing this myself...\n\ncan you provide a concrete example of such a situation? This should\nnever ever happen - cg-update should refuse to touch any files\ncontaining uncommitted changes.\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"}]}