From mboxrd@z Thu Jan 1 00:00:00 1970 From: newren@gmail.com Subject: [PATCHv2 1/5] Add additional testcases for D/F conflicts Date: Tue, 6 Jul 2010 12:51:31 -0600 Message-ID: <1278442295-23033-2-git-send-email-newren@gmail.com> References: <1278442295-23033-1-git-send-email-newren@gmail.com> Cc: gitster@pobox.com, spearce@spearce.org, agladysh@gmail.com, Elijah Newren To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Jul 06 20:44:14 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OWD7t-00072l-FU for gcvg-git-2@lo.gmane.org; Tue, 06 Jul 2010 20:44:13 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754262Ab0GFSoI (ORCPT ); Tue, 6 Jul 2010 14:44:08 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:41355 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752811Ab0GFSoG (ORCPT ); Tue, 6 Jul 2010 14:44:06 -0400 Received: by pwi5 with SMTP id 5so2094470pwi.19 for ; Tue, 06 Jul 2010 11:44:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=nT0AjnA12HHcyqEKzXw6m+Cm8MrDHrM/I/CQxISUtBY=; b=YpRBLuIwfNzuZU1YsAjcR1Yv4HNOqMspSqozxXvaci66z924xwNz/O+X1nYSsrAeLy 9fCxczWn2tBgJY1ZC5Shu5jL7mHym5AEuBBDv77jdJORNEnYI25sFn5HPMiiWmRxkUkb Ijo56DMX2CZDPDEWWfiaGG+EGoMsCBXcCsKe4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=fmvy//QhBSn5f36vxkzLdyml8pCxcnd2gujCSOgmpfsbLau04KnJ1FAlghJ18l6h4b H4nJYfnlrRkb3wyp9JoOiY2ddEGuN7HdZKVk73aO0qpMCTnPmKZ+ygoHh9Xe9eJCQ/Zf RAPDBpqrbUJhqBYc9fbgGVYfb/hdJJyKDKOtc= Received: by 10.114.76.9 with SMTP id y9mr5751950waa.192.1278441844843; Tue, 06 Jul 2010 11:44:04 -0700 (PDT) Received: from localhost.localdomain ([76.113.59.120]) by mx.google.com with ESMTPS id c24sm86219693wam.7.2010.07.06.11.44.03 (version=SSLv3 cipher=RC4-MD5); Tue, 06 Jul 2010 11:44:04 -0700 (PDT) X-Mailer: git-send-email 1.7.1.1.9.g45c1c In-Reply-To: <1278442295-23033-1-git-send-email-newren@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Elijah Newren Signed-off-by: Elijah Newren --- t/t6035-merge-dir-to-symlink.sh | 37 +++++++++++++++++++++++++++++++++++-- t/t9350-fast-export.sh | 24 ++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh index 3202e1d..3c176d7 100755 --- a/t/t6035-merge-dir-to-symlink.sh +++ b/t/t6035-merge-dir-to-symlink.sh @@ -56,7 +56,7 @@ test_expect_success 'do not lose a/b-2/c/d in merge (resolve)' ' test -f a/b-2/c/d ' -test_expect_failure 'do not lose a/b-2/c/d in merge (recursive)' ' +test_expect_failure 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)' ' git reset --hard && git checkout baseline^0 && git merge -s recursive master && @@ -64,6 +64,31 @@ test_expect_failure 'do not lose a/b-2/c/d in merge (recursive)' ' test -f a/b-2/c/d ' +test_expect_failure 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' ' + git reset --hard && + git checkout master && + git merge -s recursive baseline^0 && + test -h a/b && + test -f a/b-2/c/d +' + +test_expect_success 'do not lose untracked in merge (recursive)' ' + git reset --hard && + git checkout baseline^0 && + touch a/b/c/e && + test_must_fail git merge -s recursive master && + test -f a/b/c/e && + test -f a/b-2/c/d +' + +test_expect_success 'do not lose modifications in merge (recursive)' ' + git add --all && + git reset --hard && + git checkout baseline^0 && + echo more content >> a/b/c/d && + test_must_fail git merge -s recursive master +' + test_expect_success 'setup a merge where dir a/b-2 changed to symlink' ' git reset --hard && git checkout start^0 && @@ -82,7 +107,7 @@ test_expect_success 'merge should not have conflicts (resolve)' ' test -f a/b/c/d ' -test_expect_failure 'merge should not have conflicts (recursive)' ' +test_expect_failure 'merge should not have D/F conflicts (recursive)' ' git reset --hard && git checkout baseline^0 && git merge -s recursive test2 && @@ -90,4 +115,12 @@ test_expect_failure 'merge should not have conflicts (recursive)' ' test -f a/b/c/d ' +test_expect_failure 'merge should not have F/D conflicts (recursive)' ' + git reset --hard && + git checkout -b foo test2 && + git merge -s recursive baseline^0 && + test -h a/b-2 && + test -f a/b/c/d +' + test_done diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh index d43f37c..69179c6 100755 --- a/t/t9350-fast-export.sh +++ b/t/t9350-fast-export.sh @@ -376,4 +376,28 @@ test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj' test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag' test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj' +test_expect_failure 'directory becomes symlink' ' + git init dirtosymlink && + git init result && + ( + cd dirtosymlink && + mkdir foo && + mkdir bar && + echo hello > foo/world && + echo hello > bar/world && + git add foo/world bar/world && + git commit -q -mone && + git rm -r foo && + ln -s bar foo && + git add foo && + git commit -q -mtwo + ) && + ( + cd dirtosymlink && + git fast-export master -- foo | + (cd ../result && git fast-import --quiet) + ) && + (cd result && git show master:foo) +' + test_done -- 1.7.1.1.6.gc3cd6