From: Caleb Cushing <xenoterracide@gmail.com>
To: git@vger.kernel.org
Subject: BUG: git can't handle certain kinds of renames in merges
Date: Tue, 10 Mar 2009 10:45:25 -0400 [thread overview]
Message-ID: <81bfc67a0903100745m3a425337h3f4f7cdbde6b5cfe@mail.gmail.com> (raw)
git actually sucks at some merges 101 :P. I'm going to have to play
with my test repository further because eventually I should be able to
get git-write-tree failures making any kind of 'merge' impossible.
git://github.com/xenoterracide/git-test-case.git
clone that. checkout branch 1. then git merge master to see my end failure.
steps to create
add a file in a branch with a line (or more).
create a new branch based on this branch and check it out.
in the new branch mv the file into a directory with the same name as
the file was. add -u and add the file so git sees the rename.
checkout the original branch add some lines. checkout the new branch
merge. the merge will go fine.
remove a line from the new branches file.
checkout master. add another line to that file.
checkout new branch and attempt to merge.
you should now see the point that may test case is at.
--
Caleb Cushing
http://xenoterracide.blogspot.com
next reply other threads:[~2009-03-10 14:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-10 14:45 Caleb Cushing [this message]
2009-03-10 16:02 ` BUG: git can't handle certain kinds of renames in merges Pieter de Bie
2009-03-10 19:51 ` Caleb Cushing
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=81bfc67a0903100745m3a425337h3f4f7cdbde6b5cfe@mail.gmail.com \
--to=xenoterracide@gmail.com \
--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).