Re: cg-update with local uncommitted changes

From: Marcel Holtmann <marcel@holtmann.org>
Date: May 30, 2005, 19:27 UTC
Message-ID: <1117481244.7072.209.camel@pegasus>
In-Reply-To: <1117480796.7072.204.camel@pegasus>

Hi Petr,

Show 28 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?
> 
> I used the latest cg-update on a test repository and now it works

let me be more specific. It only works in the fast forward case. If we actually must merge the trees, because I have local committed changes and not committed changes, I see this:

link 74966c42ddd874192c318acfc5f013e56c50606a link b27ddcd47e293557e0605b98b2a1e8429035cdc5 link 568ad7814e266f84b4ac28c15a0cadfb2fdb6c80 Tree change: f345b0a066572206aac4a4f9a57d746e213b6bff:74966c42ddd874192c318acfc5f013e56c50606a :100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 568ad7814e266f84b4ac28c15a0cadfb2fdb6c80 M README

Applying changes... usage.c: needs update cg-merge: merge blocked: local changes

I changed the README in test1 repository and committed it. Then I changed Makefile in test2 repository and committed it. After that I modified usage.c and left it uncommitted. Then I pulled in the README change from test1 repository.

Regards

Marcel