From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: "Basil L. Contovounesios" Newsgroups: gmane.emacs.devel Subject: Re: [RFE] Migration to gitlab Date: Sat, 11 May 2019 20:24:03 +0100 Message-ID: <87zhnsx0a4.fsf@tcd.ie> References: <87imwhmmt8.fsf@gmail.com> <87y347g1l3.fsf@iotcl.com> <9ac21e82-8e47-f9b5-f88d-23c0c56946d1@yandex.ru> <87pnpc1lby.fsf@iotcl.com> <83zhoezdqc.fsf@gnu.org> <87imuivfcr.fsf@iotcl.com> <83k1eyfxls.fsf@gnu.org> <17D21056-10B2-4813-AE90-9B2706936CE9@icloud.com> <83imuifqjc.fsf@gnu.org> <87lfzehrug.fsf@gmail.com> <20190511021206.GA4049@ACM> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="266256"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: emacs-devel@gnu.org, monnier@iro.umontreal.ca, dgutov@yandex.ru, Alan Mackenzie , Eli Zaretskii , toon@iotcl.com, Alex Gramiak To: =?utf-8?B?7KGw7ISx67mI?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 11 21:24:19 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hPXbX-00179F-7e for ged-emacs-devel@m.gmane.org; Sat, 11 May 2019 21:24:19 +0200 Original-Received: from localhost ([127.0.0.1]:34460 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPXbW-0005nP-8M for ged-emacs-devel@m.gmane.org; Sat, 11 May 2019 15:24:18 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:48990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPXbL-0005lw-4Q for emacs-devel@gnu.org; Sat, 11 May 2019 15:24:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPXbK-0004FO-2D for emacs-devel@gnu.org; Sat, 11 May 2019 15:24:07 -0400 Original-Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:43487) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPXbJ-0004F2-RP for emacs-devel@gnu.org; Sat, 11 May 2019 15:24:05 -0400 Original-Received: by mail-ed1-x541.google.com with SMTP id w33so10512695edb.10 for ; Sat, 11 May 2019 12:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=qWqqz9goiqJZUoFtmEecdVvsJkZJ8PMAkzAB/mEK5+c=; b=X1ug5hILYN7mxqgWV1oB93ks+LS690EAI41QSRswpl+coqWHiE87OCGdDEXby5E1+b W7VtVtVY4Uoqza/5X9JCG+yOqXXYDU4NUwdlW23HU2Xov4xJWt6ipqCUh4RhsI8N3skq 6tW06gnLq74GihwKCDNTd/AK7VMw/ktdXAgOO5pSXd//228mZbubs9MaB6/CCKuv/xPr nNUGDz5gRpYhN6NXHJqEc05PfBnfV7UiU+Vbv34iB19kuU5ndZJRPy3n/59eoww2PPzg +WZpeKd4djXt9/qC9a1uSQNOLfJvlFn421BpMwhNsOMOePpdPqemqin8k3deQrYyt/uo w/8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=qWqqz9goiqJZUoFtmEecdVvsJkZJ8PMAkzAB/mEK5+c=; b=pK+oAHQvF4rokulBYHfz0k7HZpV5mJjFZhiD5HKcQSRqvf8L0k+FT8kpXI9EG1JhpF 3URPZx6DdqJv7iSroO+aNitRi6DZUgeKcj9ILRo81dyar82eNa3Z1QnpZv9FGr109/CL JnqJ9scueEDE4O/ClwxyiIgE0KoyXy479kn5bmHGW+erbZbnAFZQo4/WRUtYc8Q8mr2q lCAherA5HM8DYQOAsMSoaDOFyqkXGHnGiI0LayomJZhKZd5w2ztpu8A2YKWAwiSBp+z8 xV0x3Yl68oM88aqmS8Vu5AxNow2OHeiYU7oANy36yM+ki7Or8bbusqQ1xna0oR9nR2Ct e12w== X-Gm-Message-State: APjAAAXVfvBSwqMpF+/pF2TBRC3eIfIwRPiorBAPx892KqrZzfWUoLq0 N8mmFWoeTRRu9ST6W3uGvJr08w== X-Google-Smtp-Source: APXvYqysVOCLYxToJyFTDAq8WfNjEhXwspSh+zHI6yR5dHtn3VTwvMUe1g9RRcom/yxVomKszcV5BQ== X-Received: by 2002:a17:906:6086:: with SMTP id t6mr9281012ejj.114.1557602644875; Sat, 11 May 2019 12:24:04 -0700 (PDT) Original-Received: from localhost ([2a02:8084:20e2:c380:8cad:ae29:555d:852d]) by smtp.gmail.com with ESMTPSA id p12sm1227145ejr.18.2019.05.11.12.24.04 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 11 May 2019 12:24:04 -0700 (PDT) In-Reply-To: (=?utf-8?B?IuyhsOyEseu5iCIncw==?= message of "Sat, 11 May 2019 12:47:27 +0900") X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::541 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:236440 Archived-At: =EC=A1=B0=EC=84=B1=EB=B9=88 writes: > 2019. 5. 11. =EC=98=A4=EC=A0=84 11:12, Alan Mackenzie =EC=9E= =91=EC=84=B1: > >> I don't know what "pull/merge request" means. Does it mean a request by >> an outsider for a core contributor to perform a "git pull" operation >> from the outsider's computer, the outsider having opened up his machine >> to public access to allow this? > > An outsider that is not a core contributor cannot make a new branch > (as he/she doesn=E2=80=99t have enough authorization). So the outsider c= an > =E2=80=98fork=E2=80=99 the repo, to make an exact clone of it, push his/h= er > changes(commits) to GitLab, and make a merge request. The pull/merge > request is a request the core contributor to =E2=80=98pull=E2=80=99 the c= hanges of the > forked repo and =E2=80=98merge=E2=80=99 it just as if the forked repo is = just another > branch. This can be done by just clicking a button to merge(in the > web UI). Merging is also available in the command line; see > https://gist.github.com/adam-p/15413fabef6cffecd897 ; but I=E2=80=99ve ne= ver > seen anyone merging PRs like that in real life. FWIW, I *never* use the GitLab/GitHub UI to either (a) edit files, (b) create commits, or (c) merge merge/pull requests. Editing files and commit messages in the browser is not only an inferior experience to doing so in any decent text editor, but is also fraught with potential issues like accidentally including undesirable whitespace, omitting a trailing newline, etc. Merging things with the click of a button means you don't know what's actually happening, and I always want to control this process to the greatest extent practical. Luckily, Git makes this very easy - in my personal workflow it's as simple as 'git merge --edit --no-ff' (the --edit allows me to reference the merge request number in the merge commit message). Using a Git front-end such as Magit makes this even easier. When I then push the changes upstream, GitLab is smart enough to know that the merge request has been merged and automatically closes it. --=20 Basil