From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: [PATCH] t6024: fix timing problem
Date: Tue, 12 Dec 2006 23:49:34 +0100 (CET) [thread overview]
Message-ID: <Pine.LNX.4.63.0612122347590.2807@wbgn013.biozentrum.uni-wuerzburg.de> (raw)
In-Reply-To: <7vmz5w5tuw.fsf@assigned-by-dhcp.cox.net>
This script tests a complicated merge, where _all_ files conflict. In
these circumstances, the ordering of the commits -- which is affected
not by the timestamps in the commit message -- becomes a deciding factor
of the merge result.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
On Sat, 9 Dec 2006, Junio C Hamano wrote:
> There seem to be cases where stage #1 contains blob 'B' or 'A'
> or nothing depending on something totally random. Ring a bell?
This patch fixes it..
Depending on the order, an add/add conflict _removes_ the file
from the index, and as a consequence stage 1 is missing in the
final merge (which still fails, because the return value of the
previous merge is remembered).
How about this: if there is an add/add conflict, we treat it as
if there _was_ an empty file, and we let the shiny new xdl_merge()
find the _true_ conflicts, _instead of_ removing the file from
the index, adding both files with different "~blabla" markers
appended to their file names to the working directory.
Hmm?
t/t6024-recursive-merge.sh | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index 5f821fb..9416c27 100644
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6024-recursive-merge.sh
@@ -11,54 +11,56 @@ test_description='Test merge without common ancestors'
# X \
# 2 - C - E - G
+export GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100"
echo 1 > a1
git add a1
-git commit -m 1 a1
+GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1
git checkout -b A master
echo A > a1
-git commit -m A a1
+GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1
git checkout -b B master
echo B > a1
-git commit -m B a1
+GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1
git checkout -b D A
git-rev-parse B > .git/MERGE_HEAD
echo D > a1
git update-index a1
-git commit -m D
+GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D
git symbolic-ref HEAD refs/heads/other
echo 2 > a1
-git commit -m 2 a1
+GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1
git checkout -b C
echo C > a1
-git commit -m C a1
+GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1
git checkout -b E C
git-rev-parse B > .git/MERGE_HEAD
echo E > a1
git update-index a1
-git commit -m E
+GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E
git checkout -b G E
git-rev-parse A > .git/MERGE_HEAD
echo G > a1
git update-index a1
-git commit -m G
+GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G
git checkout -b F D
git-rev-parse C > .git/MERGE_HEAD
echo F > a1
git update-index a1
-git commit -m F
+GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
test_expect_failure "combined merge conflicts" "git merge -m final G"
git ls-files --stage > out
cat > expect << EOF
+100644 f70f10e4db19068f79bc43844b49f3eece45c4e8 1 a1
100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1
100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1
EOF
--
1.4.4.2.g473fa0-dirty
next prev parent reply other threads:[~2006-12-12 22:49 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-07 10:17 [PATCH 1/1] Make sure the empty tree exists when needed in merge-recursive Shawn O. Pearce
2006-12-09 23:55 ` [PATCH 1/3] diff_tree_sha1(): avoid rereading trees if possible Johannes Schindelin
2006-12-10 1:47 ` Junio C Hamano
2006-12-10 22:49 ` Johannes Schindelin
2006-12-09 23:56 ` [PATCH 2/3] merge-recursive: make empty tree a known object Johannes Schindelin
2006-12-10 18:37 ` Linus Torvalds
2006-12-10 21:21 ` Junio C Hamano
2006-12-10 21:31 ` Linus Torvalds
2006-12-10 22:33 ` Junio C Hamano
2006-12-10 22:54 ` Linus Torvalds
2006-12-10 22:28 ` Junio C Hamano
2006-12-10 23:16 ` Johannes Schindelin
2006-12-09 23:56 ` [PATCH 3/3] add test case for recursive merge Johannes Schindelin
2006-12-10 0:18 ` Johannes Schindelin
2006-12-10 3:10 ` Junio C Hamano
2006-12-10 22:51 ` Johannes Schindelin
2006-12-12 22:49 ` Johannes Schindelin [this message]
2006-12-12 23:23 ` [PATCH] t6024: fix timing problem Junio C Hamano
2006-12-12 23:59 ` Johannes Schindelin
2006-12-13 3:05 ` [PATCH] merge-recursive: add/add really is modify/modify with an empty base Johannes Schindelin
2006-12-13 6:33 ` Junio C Hamano
2006-12-13 11:46 ` StGit repo & gitweb, was " Johannes Schindelin
2006-12-13 11:56 ` Jakub Narebski
2006-12-13 22:09 ` Catalin Marinas
2006-12-13 23:06 ` Robin Rosenberg
2006-12-13 23:50 ` Johannes Schindelin
2006-12-13 23:57 ` Jakub Narebski
2006-12-19 18:50 ` Petr Baudis
2006-12-19 19:39 ` Jakub Narebski
2006-12-13 22:01 ` Catalin Marinas
2006-12-13 22:26 ` Junio C Hamano
2006-12-13 23:48 ` Johannes Schindelin
2006-12-14 11:31 ` Catalin Marinas
2006-12-14 11:41 ` Shawn Pearce
2006-12-14 12:00 ` Shawn Pearce
2006-12-14 13:44 ` Johannes Schindelin
2006-12-14 14:15 ` Catalin Marinas
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=Pine.LNX.4.63.0612122347590.2807@wbgn013.biozentrum.uni-wuerzburg.de \
--to=johannes.schindelin@gmx.de \
--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.
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).