From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Karl Hasselström" <kha@treskal.com>
Cc: "Jon Smirl" <jonsmirl@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: Stgit and refresh-temp
Date: Wed, 12 Nov 2008 10:02:10 +0000 [thread overview]
Message-ID: <b0943d9e0811120202wae88381j9fbc9f919b49dce5@mail.gmail.com> (raw)
In-Reply-To: <20081112080103.GA25454@diana.vm.bytemark.co.uk>
2008/11/12 Karl Hasselström <kha@treskal.com>:
> On 2008-11-11 17:59:02 +0000, Catalin Marinas wrote:
>> Could be related to this - if I run 'stg goto some-patch' and it
>> fails with a conflict, the HEAD points to the previous patch though
>> the stack has the conflicting patch as empty (which is normal) and
>> the conflicts in the index. Anything after that says HEAD and top
>> not equal and 'stg repair' is needed.
>
> Ah, yes, that could definitely be the same problem, since those two
> things end up calling the same functions to handle the conflict.
I think it's just a matter of updating HEAD on the "merge_conflict"
path but I'm still not fully confident in modifying the new lib
infrastructure.
> I'll build a test case for that as well.
We test the conflicts quite a lot in the "push" tests but this command
hasn't been converted to the new infrastructure yet.
--
Catalin
next prev parent reply other threads:[~2008-11-12 10:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-04 13:37 Stgit and refresh-temp Jon Smirl
2008-11-04 13:38 ` Jon Smirl
2008-11-04 14:50 ` Jon Smirl
2008-11-07 5:44 ` Karl Hasselström
2008-11-10 23:08 ` Jon Smirl
2008-11-10 23:10 ` Jon Smirl
2008-11-11 17:59 ` Catalin Marinas
2008-11-12 8:01 ` Karl Hasselström
2008-11-12 10:02 ` Catalin Marinas [this message]
2008-11-12 10:14 ` Karl Hasselström
2008-11-23 21:20 ` Catalin Marinas
2008-11-24 11:16 ` Karl Hasselström
2008-11-24 14:11 ` Jon Smirl
2008-11-12 12:46 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b0943d9e0811120202wae88381j9fbc9f919b49dce5@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonsmirl@gmail.com \
--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).