[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] patches missing files -> conflict?
|
From: |
Colin Walters |
|
Subject: |
Re: [Gnu-arch-users] patches missing files -> conflict? |
|
Date: |
Mon, 05 Jul 2004 22:55:21 -0400 |
On Tue, 2004-07-06 at 12:45 +1000, Robert Collins wrote:
> On Tue, 2004-07-06 at 11:36, Colin Walters wrote:
> > Hi,
> >
> > Right now, when a changeset is applied but no file exists corresponding
> > to a patch for a file identity, the patch is silently placed in a
> > ++patches-missing-files directory. Does anyone else think that this
> > should actually be treated as a conflict?
>
> No, I like that behaviour - it allows fork-and trim followed by merges.
What is fork-and trim?
signature.asc
Description: This is a digitally signed message part