* cg-update question.
@ 2005-08-21 7:17 Johnny Stenback
2005-09-12 0:02 ` Petr Baudis
0 siblings, 1 reply; 2+ messages in thread
From: Johnny Stenback @ 2005-08-21 7:17 UTC (permalink / raw
To: git
Hi all,
I hope it's ok to ask cogito questions on this list...
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...
--
jst
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: cg-update question.
2005-08-21 7:17 cg-update question Johnny Stenback
@ 2005-09-12 0:02 ` Petr Baudis
0 siblings, 0 replies; 2+ messages in thread
From: Petr Baudis @ 2005-09-12 0:02 UTC (permalink / raw
To: Johnny Stenback; +Cc: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-09-12 0:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-08-21 7:17 cg-update question Johnny Stenback
2005-09-12 0:02 ` Petr Baudis
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).