From: "Karl Hasselström" <kha@treskal.com>
To: "Catalin Marinas" <catalin.marinas@gmail.com>,
"David Kågedal" <davidk@lysator.liu.se>
Cc: git@vger.kernel.org
Subject: [StGIT PATCH 3/6] Added a test case to check what happens when push finds a conflict
Date: Sun, 26 Aug 2007 22:42:48 +0200 [thread overview]
Message-ID: <20070826204248.16700.30974.stgit@yoghurt> (raw)
In-Reply-To: <20070826203745.16700.5655.stgit@yoghurt>
From: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
t/t1203-push-conflict.sh | 64 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/t/t1203-push-conflict.sh b/t/t1203-push-conflict.sh
new file mode 100755
index 0000000..57fb477
--- /dev/null
+++ b/t/t1203-push-conflict.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 David Kågedal
+#
+
+test_description='Exercise push conflicts.
+
+Test that the index has no modifications after a push with conflicts.
+'
+
+. ./test-lib.sh
+
+test_expect_success \
+ 'Initialize the StGIT repository' \
+ 'stg init
+'
+
+test_expect_success \
+ 'Create the first patch' \
+ '
+ stg new foo -m foo &&
+ echo foo > test &&
+ echo fie > test2 &&
+ stg add test test2 &&
+ stg refresh &&
+ stg pop
+ '
+
+test_expect_success \
+ 'Create the second patch' \
+ '
+ stg new bar -m bar &&
+ echo bar > test &&
+ stg add test &&
+ stg refresh
+ '
+
+test_expect_failure \
+ 'Push the first patch with conflict' \
+ '
+ stg push foo
+ '
+
+test_expect_failure \
+ 'Show the, now empty, first patch' \
+ '
+ stg show foo | grep -q -e "^diff "
+ '
+
+test_expect_success \
+ 'Check that the index has the non-conflict updates' \
+ '
+ git diff --cached --stat | grep -q -e "^ test2 | *1 "
+ '
+
+test_expect_success \
+ 'Resolve the conflict' \
+ '
+ echo resolved > test &&
+ git add test &&
+ stg refresh
+ '
+
+test_done
next prev parent reply other threads:[~2007-08-26 20:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-26 20:42 [StGIT PATCH 0/6] David's conflict series using my subprocess stuff Karl Hasselström
2007-08-26 20:42 ` [StGIT PATCH 1/6] Split git.merge into two functions Karl Hasselström
2007-08-26 20:42 ` [StGIT PATCH 2/6] Leave working dir and index alone after failed (conflicting) push Karl Hasselström
2007-08-26 20:42 ` Karl Hasselström [this message]
2007-08-26 20:42 ` [StGIT PATCH 4/6] Simplify merge_recursive Karl Hasselström
2007-08-26 20:42 ` [StGIT PATCH 5/6] Use the output from merge-recursive to list conflicts Karl Hasselström
2007-08-26 20:43 ` [StGIT PATCH 6/6] Better error message if merge fails Karl Hasselström
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=20070826204248.16700.30974.stgit@yoghurt \
--to=kha@treskal.com \
--cc=catalin.marinas@gmail.com \
--cc=davidk@lysator.liu.se \
--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.
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).