From: Petr Baudis <pasky@suse.cz>
To: Johnny Stenback <jst@mozilla.org>
Cc: git@vger.kernel.org
Subject: Re: cg-update question.
Date: Mon, 12 Sep 2005 02:02:10 +0200 [thread overview]
Message-ID: <20050912000210.GA15630@pasky.or.cz> (raw)
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 <jst@mozilla.org> 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
prev parent reply other threads:[~2005-09-12 0:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-21 7:17 cg-update question Johnny Stenback
2005-09-12 0:02 ` Petr Baudis [this message]
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=20050912000210.GA15630@pasky.or.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=jst@mozilla.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.