From: Pavel Roskin <proski@gnu.org>
To: Petr Baudis <pasky@suse.cz>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Don't use merge labels in the ed scripts
Date: Tue, 21 Mar 2006 23:07:29 -0500 [thread overview]
Message-ID: <1143000449.23183.8.camel@dv> (raw)
In-Reply-To: <20060321214818.GY19263@pasky.or.cz>
Hi, Petr!
On Tue, 2006-03-21 at 22:48 +0100, Petr Baudis wrote:
> > > Well, I sincerely hope that they won't change again. ;-)
> >
> > Actually, it would be nice to never expose labels starting with
> > ".merge_file_" - cogito should provide more meaningful labels instead.
>
> we shouldn't ever expose them, though. If we do, that's a bug.
It turns out those labels were produced by "git merge". Either "git
merge" should be removed from the test, or "cg-reset" should be used
after the failure. I prefer the later since it's another test for
Cogito.
Once the mess from "git merge" is cleaned up, it turns out that the last
merge in the testsuite doesn't fail, and several final fixups are no
longer needed. I think it should be OK to remove corresponding code.
It has no Cogito commands other than cg-commit, which is already tested
elsewhere.
I'm sending you the new patch.
--
Regards,
Pavel Roskin
prev parent reply other threads:[~2006-03-22 4:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-21 20:54 [PATCH] Don't use merge labels in the ed scripts Pavel Roskin
2006-03-21 20:59 ` Petr Baudis
2006-03-21 21:44 ` Pavel Roskin
2006-03-21 21:48 ` Petr Baudis
2006-03-22 4:07 ` Pavel Roskin [this message]
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=1143000449.23183.8.camel@dv \
--to=proski@gnu.org \
--cc=git@vger.kernel.org \
--cc=pasky@suse.cz \
/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).