From: "Jon Smirl" <jonsmirl@gmail.com>
To: "Karl Hasselström" <kha@treskal.com>
Cc: "Catalin Marinas" <catalin.marinas@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: Stgit and refresh-temp
Date: Mon, 10 Nov 2008 18:08:54 -0500 [thread overview]
Message-ID: <9e4733910811101508h3cb30752o77b61926aeefed5b@mail.gmail.com> (raw)
In-Reply-To: <20081107054419.GA27146@diana.vm.bytemark.co.uk>
On Fri, Nov 7, 2008 at 12:44 AM, Karl Hasselström <kha@treskal.com> wrote:
> On 2008-11-04 08:37:24 -0500, Jon Smirl wrote:
>
>> I hit a case when refreshing a buried patch that needed a merge
>> conflict sorted out. I'm unable to recover out of the state.
>
> Hmm, so what you're saying is basically that you did something with
> "stg refresh -p" that caused a merge conflict, and that messed things
> up so that you needed to run "stg repair". Is that right?
Missed the reply.
Yes, that is what happed.
I think the problem was this:
File - xxxxxxx
Patch A adds a line
File - xxxxxxxa
Patch B in the middle adds a line
File - xxxxxxxab
I edit it and add a line
File - xxxxxxxabc
Line c needs to be patch A
stg refresh -p A
..messed up tree
>
> Have you been able to reproduce it? (I would like to add the failing
> case to the test suite.)
>
> --
> Karl Hasselström, kha@treskal.com
> www.treskal.com/kalle
>
--
Jon Smirl
jonsmirl@gmail.com
next prev parent reply other threads:[~2008-11-10 23:10 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 [this message]
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
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=9e4733910811101508h3cb30752o77b61926aeefed5b@mail.gmail.com \
--to=jonsmirl@gmail.com \
--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).