I know this is already applied, but...
On Wed, 30 Apr 2008 16:54:55 +0000 (UTC)
[EMAIL PROTECTED] wrote:
> Fri Apr 25 18:21:04 BST 2008 Eric Kow <[EMAIL PROTECTED]>
> * doc: tell users about darcs-2 handling of identical patches.
> Do not bother talking about darcs-1 behaviour.
hunk ./src/best_practices.tex 316
Same line does \emph{not} mean the same line number and file name,
but the same line added by a common depended-upon patch.
-Contrary to many other merging tools,
-darcs considers two patches making the \emph{same} change to be a conflict.
-In fact, darcs doesn't even look at the contents of the conflicting lines.
-If you think this is wrong, think about two different patches
-each adding a new keyword and also changing the line
-``\verb|#define NUM_OF_KEYWORDS 17|''
-to
-``\verb|#define NUM_OF_KEYWORDS 18|''.
+If you are using a darcs-2 repository (Section \ref{initialize}),
=> +darcs does considers two patches making the \emph{same} change to be a
+conflict, much in the same fashion as other version control systems.
+(The caveat here is two non-identical patches with some identical
+changes may conflict. For the most part, darcs should just do what you
+expect).
Uhm, is it right? Shouldn't that really be
darcs does NOT considers^H two patches making the \emph{same} change to be a
-----------^^^---------^
at least, this is what point 2 of chapter "Darcs-2 merging" in the
DarcsTwo wiki page says.
ciao, lele.
--
nickname: Lele Gaifax | Quando vivrò di quello che ho pensato ieri
real: Emanuele Gaifas | comincerò ad aver paura di chi mi copia.
[EMAIL PROTECTED] | -- Fortunato Depero, 1929.
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
