git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marcel Holtmann <marcel@holtmann.org>
To: Petr Baudis <pasky@ucw.cz>
Cc: GIT Mailing List <git@vger.kernel.org>
Subject: cg-update with local uncommitted changes
Date: Mon, 30 May 2005 16:25:14 +0200	[thread overview]
Message-ID: <1117463114.7072.185.camel@pegasus> (raw)

Hi Petr,

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?

Regards

Marcel



             reply	other threads:[~2005-05-30 14:22 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-05-30 14:25 Marcel Holtmann [this message]
2005-05-30 18:39 ` cg-update with local uncommitted changes Petr Baudis
2005-05-30 19:19   ` Marcel Holtmann
2005-05-30 19:27     ` Marcel Holtmann
2005-06-02 21:14       ` Petr Baudis
2005-06-02 21:26         ` Marcel Holtmann
2005-06-05 20:58           ` Petr Baudis
2005-05-30 22:31     ` Dan Holmsand
2005-05-31 15:58       ` Petr Baudis
2005-05-31 19:11         ` Dan Holmsand
2005-05-30 19:25 ` Zack Brown
2005-05-31 16:04   ` Petr Baudis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1117463114.7072.185.camel@pegasus \
    --to=marcel@holtmann.org \
    --cc=git@vger.kernel.org \
    --cc=pasky@ucw.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).