Re: Darcs and git: plan of action

From: Tupshin Harper <tupshin@tupshin.com>
Date: Apr 19, 2005, 23:32 UTC
Message-ID: <426594F9.4090002@tupshin.com>
In-Reply-To: <1113951972.29444.42.camel@orca.madrabbit.org>

Ray Lee wrote:

Show 9 quoted lines

> I'm still not communicating well.
>
>Give me a case where assuming it's a replace will do the wrong thing,
>for C code, where it's a variable or function name.
>
>Ray
>
>-
>

I think you are communicating fine, but not fully understanding darcs.

try this: initial patch creates hello.c #include <stdio.h>

int main(int argc, char *argv[])
{
  printf("Hello world!\n");
  return 0;
}

second patch: replace ./hello.c [A-Za-z_0-9] world universe

third patch, for conceptual clarity, created in another repository that 
had seen the first patch, but not the second (adds function wide_world):
hunk ./hello.c 3
+void wide_world()
+{
+  printf("Hello wide world\n");
+}
+
hunk ./hello.c 11
+  wide_world();
}

If patch2 was a replace patch, then the result of running the combined 3 patch version would be: Hello universe! Hello wide universe

but if patch2 was a non-replace patch, then the result would be: Hello universe! Hello wide world

-Tupshin