git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tupshin Harper <tupshin@tupshin.com>
To: Ray Lee <ray-lk@madrabbit.org>
Cc: git@vger.kernel.org, Kevin Smith <yarcs@qualitycode.com>,
	darcs-devel@darcs.net
Subject: Re: Darcs and git: plan of action
Date: Tue, 19 Apr 2005 16:32:09 -0700	[thread overview]
Message-ID: <426594F9.4090002@tupshin.com> (raw)
In-Reply-To: <1113951972.29444.42.camel@orca.madrabbit.org>

Ray Lee wrote:

> 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

  reply	other threads:[~2005-04-19 23:28 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-04-18 21:04 [darcs-devel] Darcs and git: plan of action linux
2005-04-19  0:07 ` Ray Lee
2005-04-19  1:05   ` Kevin Smith
2005-04-19  1:42     ` Ray Lee
2005-04-19  2:05       ` Kevin Smith
2005-04-19 22:08         ` Patrick McFarland
2005-04-19 22:40         ` Ray Lee
2005-04-19 23:00           ` Tupshin Harper
2005-04-19 23:21             ` Ray Lee
2005-04-19 23:38               ` Tupshin Harper
2005-04-19 23:03           ` [darcs-devel] " Kevin Smith
2005-04-19 23:06             ` Ray Lee
2005-04-19 23:32               ` Tupshin Harper [this message]
2005-04-20  1:11                 ` Ray Lee
2005-04-20  7:52                   ` Juliusz Chroboczek
2005-04-20 11:55                   ` David Roundy
2005-04-20 17:11               ` Ralph Corderoy
2005-04-19 11:05       ` David Roundy
     [not found] <7ivf6lm594.fsf@lanthane.pps.jussieu.fr>
2005-04-18 12:20 ` David Roundy
2005-04-18 15:38   ` Linus Torvalds
2005-04-19 10:42     ` [darcs-devel] " David Roundy
2005-04-19 14:55       ` Linus Torvalds
2005-04-19 16:33         ` [darcs-devel] " Tupshin Harper
2005-04-19 16:49           ` Linus Torvalds
2005-04-20 11:14             ` David Roundy
2005-04-19  0:55   ` Juliusz Chroboczek
2005-04-19 11:04     ` [darcs-devel] " David Roundy
2005-04-19 12:20       ` Juliusz Chroboczek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=426594F9.4090002@tupshin.com \
    --to=tupshin@tupshin.com \
    --cc=darcs-devel@darcs.net \
    --cc=git@vger.kernel.org \
    --cc=ray-lk@madrabbit.org \
    --cc=yarcs@qualitycode.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).