Re: cg-update with local uncommitted changes

From: Petr Baudis <pasky@ucw.cz>
Date: May 30, 2005, 18:39 UTC
Message-ID: <20050530183932.GB10439@pasky.ji.cz>
In-Reply-To: <1117463114.7072.185.camel@pegasus>

Dear diary, on Mon, May 30, 2005 at 04:25:14PM CEST, I got a letter where Marcel Holtmann <marcel@holtmann.org> told me that...

> Hi Petr,

Hello,

Show 19 quoted lines

> when doing a cg-update and I have local uncommitted changes it fails
> with the "... needs update" message. From some previous posts on the
> mailing list I got the impression that it is possible to pull updates
> into the local repository with changed files. At the moment I am using
> the following sequence:
> 
> 	cg-diff > patch
> 	cg-cancel
> 	cg-update origin
> 	cat patch | patch -p1
> 	rm patch
> 
> The problem with this sequence is when I have added or removed files
> from my repository. This needs a lot of manual fixing.
> 
> With Bitkeeper it was possible to pull changes as long as they don't
> affect local uncommitted files.
> 
> Any ideas on how to implement or if it exists on how to use it?

does it really fail? "... needs update" is not an error but something between informative and warning message. (I've just committed a change which silences it in this case.)

If the update did indeed fail, could you show the complete output, please?

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor