emacs-devel
[Top][All Lists]
Advanced

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

Re: merge conlict?


From: Andreas Schwab
Subject: Re: merge conlict?
Date: Mon, 25 Jan 2010 14:00:52 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux)

Óscar Fuentes <address@hidden> writes:

> While bisecting the DAG, either you remain on the left-most part, and
> then those revisions are ignored, or traverse the merged history too,
> and then you take into account lots of revisions which were intermediate
> local points on the development of some feature.

Bisection must always take all parents into account.  Otherwise how can
it find out the exact revision?

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."




reply via email to

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