Re: Expected Behavior?

From: Junio C Hamano <junkio@cox.net>
Date: Nov 10, 2005, 22:52 UTC
Message-ID: <7vzmocw1xd.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20051110203411.GX30496@pasky.or.cz>

Petr Baudis <pasky@suse.cz> writes:

Show 15 quoted lines

> Dear diary, on Wed, Nov 09, 2005 at 09:19:06AM CET, I got a letter
> where Fredrik Kuivinen <freku045@student.liu.se> said that...
>> On Tue, Nov 08, 2005 at 09:50:54PM -0800, Junio C Hamano wrote:
>> > Fredrik Kuivinen <freku045@student.liu.se> writes:
>> > 
>> Oups, I haven't thought about that. I kind of like the idea that you
>> can see the branch name in the file names though. How about replacing
>> any slashes in the branch names with underscores? So the branch
>> 'foo/bar' will give rise to files with suffixes like '_foo_bar' and
>> '_foo_bar_<number>'.
>
> I like it too. :-)
>
> Now, this would look like file3~master in Cogito (or file3~~master in
> case of name conflict, etc.).

One thing I like about Cogito's is the use of tilde instead of underscore -- much much less likely to clash with real filenames and easiliy recognizable as throwaway copies.

One thing I _don't_ like about both is there is no way for 'git reset --hard' to get rid of them, when the user decides to retry from scratch after seeing a failed merge that left too many of them.