From derby-dev-return-119539-archive-asf-public=cust-asf.ponee.io@db.apache.org Tue Dec 18 03:21:50 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0B2F9180652 for ; Tue, 18 Dec 2018 03:21:49 +0100 (CET) Received: (qmail 2787 invoked by uid 500); 18 Dec 2018 02:21:48 -0000 Mailing-List: contact derby-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: Delivered-To: mailing list derby-dev@db.apache.org Received: (qmail 2777 invoked by uid 99); 18 Dec 2018 02:21:48 -0000 Received: from mail-relay.apache.org (HELO mailrelay2-lw-us.apache.org) (207.244.88.137) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2018 02:21:48 +0000 Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) by mailrelay2-lw-us.apache.org (ASF Mail Server at mailrelay2-lw-us.apache.org) with ESMTPSA id DD6A02CCB for ; Tue, 18 Dec 2018 02:21:47 +0000 (UTC) Received: by mail-oi1-f170.google.com with SMTP id u18so731596oie.10 for ; Mon, 17 Dec 2018 18:21:47 -0800 (PST) X-Gm-Message-State: AA+aEWZyCa/Qwec60HRnnwKd5vn8JULx4mRHYn2o2RYGA3zEVx04P3e2 l6f/Nj/BhUMcW+pOdIosSSObMPeESqfc4ZqqBhY= X-Google-Smtp-Source: AFSGD/WGsBRiZW66y6V0g/jKEQRM9g0WXklzMaoZ2N38HZax+uPHd7KPQC2eDyHJ/VQLh6P1ZYFXkk6AQSiLGd0i/PY= X-Received: by 2002:aca:a9c8:: with SMTP id s191mr6935195oie.73.1545099707329; Mon, 17 Dec 2018 18:21:47 -0800 (PST) MIME-Version: 1.0 References: <3727d96b-7d24-b3f9-f67b-1729e8d59674@gmail.com> In-Reply-To: <3727d96b-7d24-b3f9-f67b-1729e8d59674@gmail.com> From: "Alex O'Ree" Date: Mon, 17 Dec 2018 21:21:36 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: switch to git? To: derby-dev@db.apache.org Content-Type: multipart/alternative; boundary="00000000000032b404057d428fe4" --00000000000032b404057d428fe4 Content-Type: text/plain; charset="UTF-8" Which merge tool is good in your opinion? I've used the tortoise products with good results Also, if mirroring to github is enabled for this project and you can accept PRs from it, then this is a moot conversation. On Mon, Dec 17, 2018 at 8:34 PM Rick Hillegas wrote: > I appreciate your willingness to contribute. Nevertheless, I think that > > * git is a poor fit for Derby's culture of incremental development and is, > instead, better suited to large projects where teams work in isolation from > one another on large contributions > > * git has the worst merge tool I have ever used > > * git is extremely confusing for developers coming from a subversion mind > set (like myself) > > * everyone I know who uses git has ended up shooting themselves in the foot > > Here is how I rank (in descending order) the repository management tools I > have used: > > * subversion (simple model, good merge tool) > * mercurial (complex model but good merge tool) > * perforce (lousy merge tool) > * clearcase (overarchitected) > * git (overarchitected, lousy merge tool) > > My $0.02, > -Rick > > On 12/17/18 4:20 PM, Alex O'Ree wrote: > > I wasn't at first either. It seems unnecessary at a glance. It does > greatly simplify accepting contributions from users without commit rights. > For outside committers, they can commit as much as they need to without > affecting the baseline. Which makes things much easier for larger tasks. > Pull requests and code reviews are much simpler than reviewing a patch > file. In general, merging branches is less painful. Just my 2 cents. > History is maintained with the conversion, in case that's a concern. > > So as someone that wants to contribute to this project, I'm asking the > question because it would make my life easier. > > On Mon, Dec 17, 2018 at 11:05 AM Rick Hillegas > wrote: > >> On 12/16/18 4:16 PM, Alex O'Ree wrote: >> > Has anyone suggested switching to git? ASF makes the change pretty >> > painless >> >> I'm not a git enthusiast. >> >> > --00000000000032b404057d428fe4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Which merge tool is good in your opinion? I've us= ed the tortoise products with good results

Al= so, if mirroring to github is enabled for this project and you can accept P= Rs from it, then this is a moot conversation.

On Mon, Dec 17, 2018 at 8:34 PM Rick Hil= legas <rick.hillegas@gmail.co= m> wrote:
=20 =20 =20
I appreciate= your willingness to contribute. Nevertheless, I think that

* git is a poor fit for Derby's culture of incremental developmen= t and is, instead, better suited to large projects where teams work in isolation from one another on large contributions

* git has the worst merge tool I have ever used

* git is extremely confusing for developers coming from a subversion mind set (like myself)

* everyone I know who uses git has ended up shooting themselves in the foot

Here is how I rank (in descending order) the repository management tools I have used:

* subversion (simple model, good merge tool)
* mercurial (complex model but good merge tool)
* perforce (lousy merge tool)
* clearcase (overarchitected)
* git (overarchitected, lousy merge tool)

My $0.02,
-Rick

On 12/17/18 4:20 PM, Alex O'Ree wrote:
=20
I wasn't at first either. It seems unnecessary at a glance. It does greatly simplify accepting contributions from users without commit rights. For outside committers, they can commit as much as they need to without affecting the baseline. Which makes things much easier for larger tasks. Pull requests and code reviews are much simpler than reviewing a patch file. In general, merging branches is less painful. Just my 2 cents. History is maintained with the conversion, in case that's a concern.

So as someone that wants to contribute to this project, I'= m asking the question because it would make my life easier.

On Mon, Dec 17, 2018 at 11:05 AM Rick Hillegas <rick.hillegas@gmail.com> wrote:
On 12/16/18 4:1= 6 PM, Alex O'Ree wrote:
> Has anyone suggested switching to git? ASF makes the change pretty
> painless

I'm not a git enthusiast.


--00000000000032b404057d428fe4--