git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: "Schalk, Ken" <ken.schalk@intel.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH] Avoid rename/add conflict when contents are identical
Date: Mon, 9 Aug 2010 21:24:25 +0000	[thread overview]
Message-ID: <AANLkTi=tnWy3w1Ek+uvS+QCr4F+An4FfZcHepiTCFGAf@mail.gmail.com> (raw)
In-Reply-To: <5C4EA6C5B30E6B45A9164CB3A26A0D326F79D9AA04@azsmsx503.amr.corp.intel.com>

On Mon, Aug 9, 2010 at 21:00, Schalk, Ken <ken.schalk@intel.com> wrote:

> Here's a simple sequence that generates this kind of conflict:
>
>  git init
>  echo content > fileA
>  git add fileA
>  git commit -m Initial
>  git checkout -b abranch
>  mv fileA fileB
>  git add fileB
>  rm fileA
>  ln -s fileB fileA
>  git add fileA
>  git commit -m Linked
>  git checkout master
>  git mv fileA fileB
>  git add fileB
>  git commit -m Moved
>  git merge --no-commit abranch

I don't know merge well enough to review the code in this patch, but
the patch would be much better if you turned this sequence of commands
(slightly altered, see t/README) into a now-passing test as part of
the patch.

t/t3030-merge-recursive.sh would be the right place to add it.

  reply	other threads:[~2010-08-09 21:24 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-09 21:00 [PATCH] Avoid rename/add conflict when contents are identical Schalk, Ken
2010-08-09 21:24 ` Ævar Arnfjörð Bjarmason [this message]
2010-08-13  1:18 ` Junio C Hamano
2010-08-27 22:14   ` Schalk, Ken
2010-08-28 10:12     ` Ævar Arnfjörð Bjarmason
2010-08-31 21:05       ` Schalk, Ken
2010-09-01 20:15       ` Schalk, Ken
2010-09-03 18:29         ` 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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to='AANLkTi=tnWy3w1Ek+uvS+QCr4F+An4FfZcHepiTCFGAf@mail.gmail.com' \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=ken.schalk@intel.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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).