Re: cg-update with local uncommitted changes

From: Zack Brown <zbrown@tumblerings.org>
Date: May 30, 2005, 19:25 UTC
Message-ID: <20050530192541.GA27047@tumblerings.org>
In-Reply-To: <1117463114.7072.185.camel@pegasus>

On Mon, May 30, 2005 at 04:25:14PM +0200, Marcel Holtmann wrote:

> Hi Petr,
> 
> when doing a cg-update and I have local uncommitted changes it fails
> with the "... needs update" message.

I don't see failures, but I do see the "needs update" message often when I do cg-update. If I run cg-update a second time it says the tree is fully up-to-date. However, if I then do a cg-diff, I will see tons of diff output. This is on a tree (the kernel) that I haven't modified at all, I only track it with cg-update.

I also track Cogito, and I use the latest form of all git and Cogito tools. Maybe somewhere along the line I've corrupted my repo by using incompatible versions of the git/Cogito toolset.

I've noticed if I do a fresh cg-clone the problem seems to go away.

Be well, Zack

Show 28 quoted lines

> 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?
> 
> Regards
> 
> Marcel
> 
> 
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Zack Brown