info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Major change in conflict handling between 1.12.9 and 1.12.13?


From: Mark D. Baushke
Subject: Re: Major change in conflict handling between 1.12.9 and 1.12.13?
Date: Thu, 01 Jun 2006 12:38:12 -0700

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Could you provide a recipe for how to reproduce this problem exactly?

I tried a few simple things without finding the problem you describe.

        -- Mark

Steve McIntyre <address@hidden> writes:

> On Tue, May 30, 2006 at 12:43:31AM +0100, Steve McIntyre wrote:
> >Hi,
> >
> >I've updated from 1.12.9 to 1.12.13 and I'm seeing a *really* major
> >change in behaviour when conflicts happen; a merge conflict is only
> >reported during the merge itself. The conflict marker itself is then
> >lost on subsequent calls to update.
> 
> <snip>
> 
> >I can't believe this change was deliberate; it's rather worrying, and
> >it breaks normal workflow - I've had several user complaints
> >already. Should I raise a bug?
> 
> Any response from the developers? Derek? Mark?
> 
> -- 
> Steve McIntyre, Cambridge, UK.                                address@hidden
> "I can't ever sleep on planes ... call it irrational if you like, but I'm
>  afraid I'll miss my stop" -- Vivek Dasmohapatra
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (FreeBSD)

iD8DBQFEf0IkCg7APGsDnFERAo2nAKCOhN9hyNHWfCMObY3AuG138A9PDgCgpaCL
Fxxq5sTmlJk5zXSiIdJJ8vU=
=h0EB
-----END PGP SIGNATURE-----




reply via email to

[Prev in Thread] Current Thread [Next in Thread]