From: Felipe Contreras <felipe.contreras@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Sverre Rabbelier <srabbelier@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Ilari Liusvaara <ilari.liusvaara@elisanet.fi>,
Daniel Barkalow <barkalow@iabervon.org>
Subject: Re: [PATCH] Add new git-remote-hd helper
Date: Sun, 21 Oct 2012 22:31:27 +0200 [thread overview]
Message-ID: <CAMP44s3xo6dnNa_-AkhDurvWqp5yC-idoZ_bkcPdPwYsmtWf-A@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.1210212138290.2695@bonsai2>
On Sun, Oct 21, 2012 at 10:03 PM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> On Sun, 21 Oct 2012, Felipe Contreras wrote:
>
>> On Thu, Oct 18, 2012 at 10:47 AM, Johannes Schindelin
>> <Johannes.Schindelin@gmx.de> wrote:
>>
>> > Without push support, remote-hg is useless to me. Without regression
>> > tests proving that it is rock solid, I will not use remote-hg.
>>
>> Done and done. My remote-hg now has support for pushing, all in less
>> than 500 lines of code. It also manages to pass all 14 of the "extensive
>> tests" of your remote-hg. Anything else?
>
> While I think that a lot of effort was duplicated now, and while I am
> still interested in less handwaving arguments than "I find the code
> bloated",
The only way to avoid duplicated effort is to work together, and I've
yet to see where the remote-hg branch is supposed to be (without any
msysgit stuff), so that other people can give it a try, and propose
changes.
> P.S.: Sverre's remote-hg does not really handle octopus merges. It is
> incomplete. I had a good plan how to complete it (see the msysGit wiki
> page about remote-hg) but lacked the time to implement it (the problem is
> that hg does not have octopus merges, and we want things to be
> bidirectional).
Yeah, I'm aware mercurial doesn't have those, that's why I didn't
implement that, other tools do something similar as you mention in the
wiki, but the code is rather convoluted.
Note that this doesn't prevent things to be bidirectional, what it
prevents is using this tool to export git repositories to mercurial,
not the other way around. If you do an octopus merge on a repository
that you know is going to end in mercurial, that's just asking for
trouble, and complaints from the other users of that repo.
Anyway, I don't think that feature is that important, what is more
important is to make sure renames and branches are stored properly. I
have tests that check that the output is the the same as hg-git, but
I'm still not there.
Cheers.
--
Felipe Contreras
next prev parent reply other threads:[~2012-10-21 20:31 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-17 12:58 [PATCH] Add new git-remote-hd helper Felipe Contreras
2012-10-17 16:03 ` Johannes Schindelin
2012-10-17 16:38 ` Felipe Contreras
2012-10-17 17:39 ` Johannes Schindelin
2012-10-17 18:12 ` Felipe Contreras
2012-10-17 18:18 ` Sverre Rabbelier
2012-10-17 18:33 ` Felipe Contreras
2012-10-18 8:47 ` Johannes Schindelin
2012-10-18 9:03 ` Felipe Contreras
2012-10-18 9:10 ` Johannes Schindelin
2012-10-18 9:26 ` Junio C Hamano
2012-10-18 9:38 ` Felipe Contreras
2012-10-18 9:42 ` Matthieu Moy
2012-10-21 18:03 ` Felipe Contreras
2012-10-21 20:03 ` Johannes Schindelin
2012-10-21 20:31 ` Felipe Contreras [this message]
2012-10-17 22:59 ` Jeff King
2012-10-18 3:44 ` Felipe Contreras
2012-10-18 5:18 ` Felipe Contreras
2012-10-18 6:12 ` Sverre Rabbelier
2012-10-18 9:10 ` Felipe Contreras
2012-10-18 9:13 ` Johannes Schindelin
2012-10-18 9:22 ` Felipe Contreras
2012-10-26 9:02 ` Felipe Contreras
2012-10-18 8:48 ` Felipe Contreras
2012-10-18 13:18 ` Michael J Gruber
2012-10-18 14:26 ` Felipe Contreras
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAMP44s3xo6dnNa_-AkhDurvWqp5yC-idoZ_bkcPdPwYsmtWf-A@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ilari.liusvaara@elisanet.fi \
--cc=srabbelier@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).