Re: any good diff merging utility?
Jonathan Lundell (jlundell@pobox.com)
Sun, 17 Jun 2001 17:41:01 -0700
At 2:34 AM +0200 2001-06-18, Ivan Vadovic wrote:
>Very often the case is that they indeed can be merged automagically.
>For example two patches inserting few lines right after the #include
>lines.
>
>patch1:
>@@ 10,1 10,2 @@
> #include <foo.h>
>+#include <1.h>
>
>patch2:
>@@ 10,1 10,2 @@
> #include <foo.h>
>+#include <2.h>
>
>The patch will fail to patch :-). But there is no real conflict between
>the patches.
Problem is, you can't tell automatically. Even if the diffs don't
conflict physically, it's entirely possible that they conflict
logically.
--
/Jonathan Lundell.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/