[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] patches missing files -> conflict?
|
From: |
Robert Collins |
|
Subject: |
Re: [Gnu-arch-users] patches missing files -> conflict? |
|
Date: |
Tue, 06 Jul 2004 12:45:12 +1000 |
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.
Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
signature.asc
Description: This is a digitally signed message part