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:12:38 +0300 Message-ID: <834jw33rmx.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> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27876"; 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 08:22:54 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 1okJWY-000762-7h for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Oct 2022 08:22:54 +0200 Original-Received: from localhost ([::1]:54848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okJWW-0005IY-Pp for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Oct 2022 02:22:52 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okJMq-0001nn-Ip for emacs-devel@gnu.org; Mon, 17 Oct 2022 02:12:54 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:57196) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okJMp-0007Ea-CK; Mon, 17 Oct 2022 02:12:51 -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=qG0+ZQ0BmFXU+3JyE34FXNSQ/94seZ9UafZGCxS/C40=; b=eJ7NlgmTBvEw 2kCvp4PdcaekrS7squhZJXQDqyEc2MjlaK7KTV+bAf/KQLELTixc29sRbPvmcR6zJZjxmgsJ0Uvkq gmPh0fI4HxOwiEhqKaqRQcMneaHcDSzL+EmxV0tBZLIswwfsadixaoeTGZkeIxbmxghXl4GM6SHZy CWTEilxsZ+Kzaw9vOqqyGu1B3I1Ean4b7EuaE+S9XPHkdnCJ82/TcZq9bGmD1ZyQcfcqlAOvm3oOs lLyPfSrNQEDJ8WYFcQtpKbHc2xqYNKLHLNZuIFL/s9UOBqVjKPXkCHmHXQ5Bo/YlAWDZpkdFwFeW2 mXYNSf6wWwvr3PFUiTfUTw==; Original-Received: from [87.69.77.57] (port=2060 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 1okJMo-0004SX-Iu; Mon, 17 Oct 2022 02:12:50 -0400 In-Reply-To: <87a65v2ytp.fsf@posteo.net> (message from Philip Kaludercic on Sun, 16 Oct 2022 22:22:42 +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:297917 Archived-At: > From: Philip Kaludercic > Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org > Date: Sun, 16 Oct 2022 22:22:42 +0000 > > > From the shell prompt, "git pull" will fail if the changes are in the > > same file as one of those whose changes are brought in by the pull, > > but either using --rebase or maybe the stash/pull/unstash dance should > > take care of that, I guess? > > Right, I believe it was something along these lines but this is > something that is difficult to automate. 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?