From: Petr Baudis Date: Mon, 12 Sep 2005 00:02:10 GMT Subject: Re: cg-update question. Message-ID: <20050912000210.GA15630@pasky.or.cz> In-Reply-To: <43082A96.1070700@mozilla.org> Dear diary, on Sun, Aug 21, 2005 at 09:17:42AM CEST, I got a letter where Johnny Stenback told me that... > Hi all, Hello, > I just realized that if I've got an uncommitted local change in a tree > and I update my tree with cg-update to merge in changes from a different > tree... cg-update will pull the changes and do the merge. So that's all > cool, but as it does the merge, it will re-write my local file that has > the uncommitted change, even if that file didn't change in the > repository I pulled from, i.e. nothing to merge for that file. > > This is, to me at least, not the desired behavior, if there's no reason > for cg-update to touch a file it shouldn't. > > Thoughts? If someone points me in the right direction I'm willing to > take a stab at fixing this myself... can you provide a concrete example of such a situation? This should never ever happen - cg-update should refuse to touch any files containing uncommitted changes. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ If you want the holes in your knowledge showing up try teaching someone. -- Alan Cox