From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Junio C Hamano" <junkio@cox.net>
Cc: git@vger.kernel.org, "Shawn Pearce" <spearce@spearce.org>
Subject: Re: bug?: stgit creates (unneccessary?) conflicts when pulling
Date: Fri, 10 Mar 2006 11:13:41 +0000 [thread overview]
Message-ID: <b0943d9e0603100313l37f67f62h@mail.gmail.com> (raw)
In-Reply-To: <7vslpr2ojz.fsf@assigned-by-dhcp.cox.net>
On 09/03/06, Junio C Hamano <junkio@cox.net> wrote:
> "Catalin Marinas" <catalin.marinas@gmail.com> writes:
>
> > Trying to implement this, I've just noticed that git-read-tree has a
> > --aggressive option which takes care of the file removals. Adding this
> > option lowered the pushing time in StGIT from ~2 min to under 2
> > seconds (merges between 2.6.14 and the latest kernel). There's
> > probably no need to deal with file removals in pg--merge-all anymore.
>
> Yup, it was originally done to improve the performance of
> resolve merge strategy, but I am glad somebody else has found
> use for it.
Actually, I asked for it about 6 months ago:
http://marc.theaimsgroup.com/?l=git&m=112677889118711&w=2
and I got the reply from you :-):
http://marc.theaimsgroup.com/?l=git&m=112690084826630&w=2
Anyway, it's good we have it, it saved me some time with implementing
Shawn's merging algorithm.
--
Catalin
next prev parent reply other threads:[~2006-03-10 11:13 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-27 20:42 bug?: stgit creates (unneccessary?) conflicts when pulling Karl Hasselström
2006-02-27 21:45 ` Sam Vilain
2006-02-27 22:17 ` Catalin Marinas
2006-02-28 15:00 ` Catalin Marinas
2006-02-28 18:53 ` Catalin Marinas
2006-02-28 22:45 ` Catalin Marinas
2006-03-01 17:39 ` Chuck Lever
2006-03-01 17:53 ` Catalin Marinas
2006-03-03 14:13 ` Karl Hasselström
2006-03-03 21:57 ` Catalin Marinas
2006-03-03 14:24 ` Karl Hasselström
2006-03-03 22:07 ` Catalin Marinas
2006-02-27 22:26 ` Shawn Pearce
2006-03-01 10:59 ` Catalin Marinas
2006-03-01 14:51 ` Shawn Pearce
2006-03-01 15:08 ` Catalin Marinas
2006-03-01 15:50 ` Shawn Pearce
2006-03-09 22:00 ` Catalin Marinas
2006-03-09 23:20 ` Junio C Hamano
2006-03-10 11:13 ` Catalin Marinas [this message]
2006-03-11 6:46 ` Junio C Hamano
2006-03-10 16:23 ` Shawn Pearce
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=b0943d9e0603100313l37f67f62h@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=spearce@spearce.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.
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).