git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Catalin Marinas <catalin.marinas@gmail.com>
To: Blaisorblade <blaisorblade@yahoo.it>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Stgit - gitmergeonefile.py: handle removal vs. changes
Date: Sat, 07 Jan 2006 11:23:05 +0000	[thread overview]
Message-ID: <43BFA499.3020202@gmail.com> (raw)
In-Reply-To: <200512301859.51000.blaisorblade@yahoo.it>

Blaisorblade wrote:

>The original patch hasn't been merged, nor (for what I see) anything else to 
>fix this problem has been done.
>  
>
Indeed, I forgot about it.

>I assume the patch was lost waiting for the discussion to settle down, but the 
>patch can be merged, even changing the default choices in any way (see 
>below).
>  
>
I merged it as it is. I will think about the default options once I get
some time to fix the .local, .older and .remote extensions (give them
some meaningful names).

>Also, another note: I just found Bruce Eckel mentioning pychecker, which is a 
>static code checker for Python (to perform the checks a compiler would 
>normally do). I've not the time to investigate more myself, but I hope it can 
>be useful to you.
>  
>
Thanks. I'll give it a try.

Catalin

  reply	other threads:[~2006-01-07 11:23 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-11-13 19:42 [PATCH] Stgit - gitmergeonefile.py: handle removal vs. changes Paolo 'Blaisorblade' Giarrusso
2005-11-15  9:54 ` Catalin Marinas
2005-11-16 14:44   ` Blaisorblade
2005-11-17 22:10     ` Catalin Marinas
2005-11-17 22:50       ` Chuck Lever
2005-11-21 21:32         ` Catalin Marinas
2005-12-30 17:59   ` Blaisorblade
2006-01-07 11:23     ` Catalin Marinas [this message]
2006-01-08  1:50       ` Chuck Lever

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=43BFA499.3020202@gmail.com \
    --to=catalin.marinas@gmail.com \
    --cc=blaisorblade@yahoo.it \
    --cc=git@vger.kernel.org \
    /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).