git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alp Toker <alp@atoker.com>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Fix some doubled word typos
Date: Mon, 10 Jul 2006 01:32:31 +0100	[thread overview]
Message-ID: <44B1A01F.5090408@atoker.com> (raw)
In-Reply-To: <11524377844177-git-send-email-alp@atoker.com>

Alp Toker wrote:
> Signed-off-by: Alp Toker <alp@atoker.com>
> ---
>  Documentation/git-svn.txt |    2 +-
>  Documentation/urls.txt    |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

My patch was made against the 'next' branch, where the file had recently 
been moved to Documentation/git-svn.txt, but it was applied to the 
'master' branch where the file still exists at 
contrib/git-svn/git-svn.txt as it has not yet been moved.

As a result, it seems that only the modification to 
Documentation/urls.txt in this patch made it into the repository, with 
the fix to Documentation/git-svn.txt having been silently omitted.

By the time the commit was merged from 'master' to 'next', it had 
permanently lost the modification to git-svn.txt, and even though the 
commit message claims to "Fix some doubled word typos" it only fixes one.

Could this situation have been avoided if the patch had mentioned that 
it was against the 'next' branch? Should/does git warn the user if a 
patch modifies files that don't exist? Would rename tracking have helped 
this patch to apply properly?

  parent reply	other threads:[~2006-07-10  0:32 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-07-09  9:36 [PATCH] Fix some doubled word typos Alp Toker
2006-07-09  9:36 ` [PATCH] Fix typos involving the word 'commit' Alp Toker
2006-07-10  0:32 ` Alp Toker [this message]
2006-07-10  0:50   ` [PATCH] Fix some doubled word typos Junio C Hamano
2006-07-10  1:42     ` Alp Toker
2006-07-10  2:04       ` Junio C Hamano

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=44B1A01F.5090408@atoker.com \
    --to=alp@atoker.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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).