From: "David Kågedal" <davidk@lysator.liu.se>
To: "Karl Hasselström" <kha@treskal.com>
Cc: git@vger.kernel.org, catalin marinas <catalin.marinas@gmail.com>
Subject: Re: [StGit PATCH 2/6] Don't try to merge files that merge-recursive already merged
Date: Wed, 22 Aug 2007 11:37:03 +0200 [thread overview]
Message-ID: <87sl6bewqo.fsf@morpheus.local> (raw)
In-Reply-To: <20070822092152.GB30748@diana.vm.bytemark.co.uk> (Karl Hasselström's message of "Wed, 22 Aug 2007 11:21:52 +0200")
Karl Hasselström <kha@treskal.com> writes:
> On 2007-08-20 10:11:59 +0200, David Kågedal wrote:
>
>> This avoid duplicating work, but also changes the resulting index
>> state so that the conflicts are left in the index in the three
>> stages.
>
> After this patch, t1400-patch-history fails:
I think that the push(c) commits will never happen with my patches, so
the test case needs an update.
> * ok 1: Initialize the StGIT repository
> * ok 2: Create the first patch
> * ok 3: Create the second patch
> * ok 4: Check the "new" and "refresh" logs
> * ok 5: Check the log annotation
> * ok 6: Check the "push" log
> * ok 7: Check the "push(f)" log
> * ok 8: Check the "push(m)" log
> * FAIL 9: Check the "push(c)" log
>
> echo bar > test && stg refresh &&
> stg pop &&
> echo foo > test && stg refresh &&
> ! stg push &&
> stg log --full | grep -q -e "^push(c) "
>
> * ok 10: Check the push "undo" log
> * ok 11: Check the refresh "undo" log
> * failed 1 among 11 test(s)
>
> I'll see if I can figure out what's wrong.
--
David Kågedal
next prev parent reply other threads:[~2007-08-22 9:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-20 8:11 [StGit PATCH 0/6] Use git conflict handling on push David Kågedal
2007-08-20 8:11 ` [StGit PATCH 1/6] Split git.merge into two functions David Kågedal
2007-08-20 8:11 ` [StGit PATCH 2/6] Don't try to merge files that merge-recursive already merged David Kågedal
2007-08-20 8:12 ` [StGit PATCH 3/6] Don't touch state after conflict in push David Kågedal
2007-08-20 8:12 ` [StGit PATCH 4/6] Added a test case to check what happens when push finds a conflict David Kågedal
2007-08-20 8:12 ` [StGit PATCH 5/6] Simplify merge_recursive David Kågedal
2007-08-20 8:12 ` [StGit PATCH 6/6] Use the output from merge-recursive to list conflicts David Kågedal
2007-08-22 9:21 ` [StGit PATCH 2/6] Don't try to merge files that merge-recursive already merged Karl Hasselström
2007-08-22 9:37 ` David Kågedal [this message]
2007-08-22 9:44 ` Karl Hasselström
2007-08-22 9:59 ` Karl Hasselström
2007-08-22 10:29 ` [StGIT PATCH] Leave working dir and index alone after failed (conflicting) push Karl Hasselström
2007-08-20 8:55 ` [StGit PATCH 1/6] Split git.merge into two functions David Kågedal
2007-08-20 23:52 ` Junio C Hamano
2007-08-21 19:35 ` Uwe Kleine-König
2007-08-22 10:04 ` Junio C Hamano
2007-08-22 9:17 ` [StGit PATCH 0/6] Use git conflict handling on push Karl Hasselström
2007-08-23 14:54 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sl6bewqo.fsf@morpheus.local \
--to=davidk@lysator.liu.se \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=kha@treskal.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.
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).