Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Received-SPF: pass (athena.apache.org: domain of dch@jsonified.com designates
 209.85.215.177 as permitted sender)
Date: Tue, 21 Jan 2014 15:00:04 +0100
From: Dave Cottlehuber <dch@jsonified.com>
To: dev@couchdb.apache.org
Message-ID: <etPan.52de7d64.46e87ccd.15f6@akai.jsonified.com>
In-Reply-To: 
 <CAJ_m3YAGOSQ2Pcj4_Eqr_e-sPCQ0CO3RMEgqCG=OM51vimzBAQ@mail.gmail.com>
References: 
 <CAJ_m3YDruu=0P-dQZiQwDAp4ac=zXRrqwA9bMa+nJWW0ZRayWA@mail.gmail.com>
 <CAJNb-9oFctms3MVmsMV6jYdRSc3trWsp-b_Y22PAP0kQ+K_vkg@mail.gmail.com>
 <CAJ_m3YAGOSQ2Pcj4_Eqr_e-sPCQ0CO3RMEgqCG=OM51vimzBAQ@mail.gmail.com>
 <CAJ_m3YAGOSQ2Pcj4_Eqr_e-sPCQ0CO3RMEgqCG=OM51vimzBAQ@mail.gmail.com>
Subject: Re: Git Repository Creation
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

> On 21. J=C3=A4nner 2014 at 10:20:58, Paul Davis (paul.joseph.davis=40gm=
ail.com) wrote:
> ...
> As to bigcouch/rcouch conflicts its something we'll need to =20
> figure out
> for sure. I don't really see much point in trying to create
> bigcouch/rcouch specific branches for the initial import though. =20
> I did
> include bigcouch merge related patches on both of couch and
> couch=5Freplicator cause I was worried about the history extraction. =20
> =20
> The =22proper=22 approach I think is to go back and reset each repo =20
> to the
> equivalent commit pointed at by the merge-rebase-target tag =20
> and then
> we should create branches 1843-feature-bigcouch and 1994-merge-rcouch =20
> branches in each repo where we have conflicts. Once that's done =20
> we can
> focus on the actual conflicts to see where we need to work on merging =20
> actual code changes. The important part here is to have a common =20
> history for each sub-repo we agree on that is the initial import =20
> and
> then we can focus on the merge work at hand.
> =20
> =46or the upstream repos I need to add some more work to those to
> reflect changes that we've made since march of this year when =20
> we
> started the bigcouch merge. I definitely agree that we should =20
> be
> pushing our changes upstream so that these are as close to raw =20
> mirrors
> as possible. The ibrowse and mochiweb branches were direct from =20
> upstream repos and I think I pulled oauth from the rcouch repo. =20
> The
> mochiweb commit was super old but ibrowse was relatively close. =20
> I know
> we've changed things here recently and we'll want to get as much =20
> of
> that upstream as possible.
> =20
> I'm going to be digging back into this work at the end of the week =20
> or
> early next week. Let me know if you find anything else that needs =20
> to
> be addressed.
> =20

WRT to Mochiweb, moving to a later upstream requires us to drop < R15B co=
mpatibility I think. rcouch is ok with current Erlang, what is your opini=
on wrt to bigcouch=3F

-- =20
Dave Cottlehuber
Sent from my PDP11