[darcs-devel] Example Conflicts

[David Roundy]

On Thu, Aug 02, 2007 at 03:25:11PM +0100, Ian Lynagh wrote:
> On Wed, Aug 01, 2007 at 10:54:43AM -0700, David Roundy wrote:
> > On Wed, Aug 01, 2007 at 01:58:29AM +0100, Ian Lynagh wrote:
> > 
> > > > You merge A and B by choosing to cancel A in favor of B.  Now you want
> > > > to pull C into  your repository.
> > > > 
> > > > I was explaining it like thus:
> > > > First you get X[](A)X[](B)
> > > > Now you cancel A, so remerge brings B back to life.  So then you have:
> > > > X[](A) B (Cancel A)
> > > 
> > > Am I right in thinking that there is only 1 "cancel A" patch, so for
> > > example if you and I both cancel A and then pull from each other there
> > > is no conflict?
> > 
> > My thought is that you can have multipel "Cancel A" patches, but they won't
> > conflict with each other.
> 
> What is the benefit of having multiple "Cancel A" patches?

There's no benefit to having them, but the benefit of *allowing* them is
that it is harmful to have them conflict.
-- 
David Roundy
Department of Physics
Oregon State University