From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: feature/package+vc 04c4c578c7 3/4: Allow for packages to be installed directly from VCS Date: Mon, 17 Oct 2022 09:57:41 +0300 Message-ID: <83wn8z2aze.fsf@gnu.org> References: <164484721900.31751.1453162457552427931@vcs2.savannah.gnu.org> <20220214140020.04438C00891@vcs2.savannah.gnu.org> <87bkqmqpvb.fsf@posteo.net> <87edv96q4j.fsf@posteo.net> <83tu455a5s.fsf@gnu.org> <87a65v2ytp.fsf@posteo.net> <834jw33rmx.fsf@gnu.org> <87pmer0xtz.fsf@posteo.net> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9499"; mail-complaints-to="usenet@ciao.gmane.io" Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Philip Kaludercic Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Oct 17 09:07:23 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1okKDZ-0002Cy-D7 for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Oct 2022 09:07:21 +0200 Original-Received: from localhost ([::1]:45976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okKDX-0006A4-MP for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Oct 2022 03:07:19 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okK4S-0006Jl-Au for emacs-devel@gnu.org; Mon, 17 Oct 2022 02:57:56 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:37714) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okK4Q-0005EY-V7; Mon, 17 Oct 2022 02:57:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=gLBPsiSai1hxh+JwZSHKYam/kUigU8D3kqg59yvyuO4=; b=lM+vYYolSxMb vnIajjsN/Fk+fgGFUi1J8wwGjkowX70prE7ltJRdCWfdOWjy/LNruDeezy8RoZh2Zy0IVwkzHGe/h 9vqf0zTwbesoCFOSwuLv0h20dADzsxEi1QaeJ1uvoOTiIZ2n/3qP5fYe7r7uk66S9b9C3nuKgnPe3 8MnIGw1hDmdcpW6IxWeKAVwKtpMR12GJU2rPmXkWvLlPWRMEe7kaLFH1fLfvTJ+1qnIw+32OpdAGM ii89FIwNnN+WSP1leAnBOZ6nXv06d+AcNNrMGFZWBYdc+8VsIdNHi74xkeYplg7p0jOfqzaA/wO+e EUMs0PBXidS2G7t5D3MKJQ==; Original-Received: from [87.69.77.57] (port=4795 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okK4Q-0008FP-7I; Mon, 17 Oct 2022 02:57:54 -0400 In-Reply-To: <87pmer0xtz.fsf@posteo.net> (message from Philip Kaludercic on Mon, 17 Oct 2022 06:27:04 +0000) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:297924 Archived-At: > From: Philip Kaludercic > Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org > Date: Mon, 17 Oct 2022 06:27:04 +0000 > > Eli Zaretskii writes: > > > Can you elaborate on the "difficult" part? You could always stash any > > local changes before pulling, then un-stashing them after. This > > should work reliably, I think? > > Difficult in the sense that to my knowledge there is no --dwim flag to > tell Git to try and avert a conflict at any cost. Instead you would > have to know what the right operation is depending on the current state > of the repository and the kinds of conflicts that pulling creates. If the changes are in the same parts of a file, merge conflicts are inevitable, and are a necessary part of this kind of operation. So why is that perceived as a problem? I think we should try to avoid conflicts and failures where a simple-minded merge will do. But if a conflict is inevitable, we should punt and let the user fix that.