From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH/RFC] read-tree -m -u: do not overwrite or remove untracked working tree files.
Date: Wed, 17 May 2006 10:24:30 +0200 [thread overview]
Message-ID: <e4emjq$73g$1@sea.gmane.org> (raw)
In-Reply-To: 7v8xp1jc9h.fsf_-_@assigned-by-dhcp.cox.net
Junio C Hamano wrote:
> This is an RFC patch that I consider of somewhat dubious value.
> Not the implementation quality, but the semantic change it
> implies. Before, we could freely work in a working tree, which
> is just a scratch area to build the index, littered with
> throw-away files, knowing they would not prevent merge between
> our HEAD and other branch from happenning even if a merge needs
> to blow them away. With this change, it is not a case anymore.
> Your merge will fail to proceed and you have to remove those
> throw-away files yourself and retry the merge. The extent of
> the damage can be seen by the change to t1002 test this commit
> contains. It arguably is making things much safer by refusing to
> proceed, so this might be a desirable change. I am still
> undecided.
Perhaps the behavior should be decided by the config option, e.g.
core.preserveWorkingTree; of course that leave us with the problem what
value should be the default: the one preserving backward compatibility, or
the more safe one.
And of course --force to blow away changes anyway...
--
Jakub Narebski
Warsaw, Poland
prev parent reply other threads:[~2006-05-17 8:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-16 22:00 Merge with local conflicts in new files Santi
2006-05-16 22:12 ` Santi
2006-05-16 22:40 ` Junio C Hamano
2006-05-16 23:11 ` Santi
2006-05-16 23:28 ` Junio C Hamano
2006-05-17 7:47 ` Pavel Roskin
2006-05-17 8:20 ` Junio C Hamano
2006-05-17 8:50 ` Martin Langhoff
2006-05-17 8:17 ` [PATCH/RFC] read-tree -m -u: do not overwrite or remove untracked working tree files Junio C Hamano
2006-05-17 8:24 ` Jakub Narebski [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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='e4emjq$73g$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.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.
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).