Re: Continued work on sr/vcs-helper and sr/gfi-options

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 6, 2009, 01:47 UTC
Message-ID: <7vr5r8oov1.fsf@alter.siamese.dyndns.org>
In-Reply-To: <fabb9a1e0912051653s77ba25e1g9ff1e21219cd06c9@mail.gmail.com>

Sverre Rabbelier <srabbelier@gmail.com> writes:

Show 9 quoted lines

> I'm planning to start finishing up git-remote-hg this week, and for
> that I need both sr/vcs-helper (in next) and sr/gfi-options (in pu).
> How can I best go about working on these? I _think_ what I want is to
> merge sr/vcs-helper and sr/gfi-options, into either master or next
> (with a three-way merge), but I'm not sure? Also, when I try to rebase
> sr/vcs-helper onto master I get conflicts yet again, since these were
> already resolved in next, what is the best way for me to proceed in
> such a way that it is convenient for you (Junio) and the list, if
> possible, without having to untangle those merge conflicts.

Some observations.

 - sr/vcs-helper seems to be near completion; I'd expect it to be among
   the first batch of topics to go to 'master' after 1.6.6 final (some
   fixes may happen between now and 1.6.6 final to make the series a bit
   longer, though).

 - sr/gfi-options started moving again and there could be a couple more
   iterations before it would hit 'next'.

Until sr/gfi-options becomes more solid, one way we can manage sr/remote-hg is (thinking aloud):

 - Fork sr/remote-hg from today's sr/vcs-helper;

 - Merge today's 'master' to sr/remote-hg (optional);

 - Whenever any updates to vcs-helper topic appears, apply them to
   sr/vcs-helper, and merge the result to sr/remote-hg;

 - Create an unstable sr/pu-remote-hg branch that:

   - is reset to the tip of sr/remote-hg at the beginning of the day;
   - merges the day's sr/gfi-options on top;
   - re-applies patches to implement Hg interoperation on top of the
     result.

When sr/gfi-options becomes solid, we can merge it to sr/remote-hg itself, get rid of sr/pu-remote-hg "patch queue", and move the Hg interoperation patches we helpd in sr/pu-remote-hg to sr/remote-hg branch. We will merge early parts of sr/remote-hg (at least up to the merge with sr/gfi-options, and perhaps early parts of individual Hg interoperation patches as well) to 'next', and remaining parts on the branch to 'pu' (and they can be replaced).