[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] [BUG] merging new files into a renamed directory lo
|
From: |
Phil Frost |
|
Subject: |
Re: [Gnu-arch-users] [BUG] merging new files into a renamed directory looses the file |
|
Date: |
Tue, 12 Oct 2004 22:13:13 -0400 |
|
User-agent: |
Mutt/1.5.6+20040722i |
On Tue, Oct 12, 2004 at 08:48:47PM -0500, John Meinel wrote:
> Phil Frost wrote:
> > ...
> >
> >Observed behavior:
> >
> >after merging 'main' into 'B', a directory 'fu' is created, with the new
> >file in it. tree-lint reports this directory as "would be source if it
> >had an id."
> >
> > ...
>
> This has actually been around for quite some time, and I know it's been
> debated in the past. (I've been one of the ones that brought it up.)
>
> ...
Perhaps then this condition can be detected and reported as a conflict
instead of silently dropping the file. Then there would be an indication
that there is something that should be resolved before committing the
merge.