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: Sat, 15 Oct 2022 19:22:39 +0300 Message-ID: <83tu455a5s.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> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22527"; 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 Sat Oct 15 18:23:32 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 1ojjwg-0005cG-W4 for ged-emacs-devel@m.gmane-mx.org; Sat, 15 Oct 2022 18:23:31 +0200 Original-Received: from localhost ([::1]:53966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ojjwf-0003WM-Uf for ged-emacs-devel@m.gmane-mx.org; Sat, 15 Oct 2022 12:23:29 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojjvz-0002XM-0K for emacs-devel@gnu.org; Sat, 15 Oct 2022 12:22:47 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:49046) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ojjvy-0004nd-LE; Sat, 15 Oct 2022 12:22:46 -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=xDjwybCrKPF9oddNBKHtg8g/1kMoJkDIF8j4nngoHtQ=; b=G+i3QM1AKQkP atVy1os0AoPjJ1ydSu3EgoGZN45xvlprCKkO4ujVomEykgpP/BxySRPbZ5cVBLXG+3HtWwXz00+dE /Ujzj7NJVGk00XhCPNJQdMX/Brdz4u+EY+XTF7C9jYwyW5LRxOCS/KFAysVyznpRHFW+1WLWtL/1V wMPcXgxVqhcF95Dc30Q+uJEKYWQVzKTQVUQLd0ekrDc4fcab3x/tidPv0PFc4axnRlnz6vionylN2 wIyntHcFoETJDbrYbT5b7KaQ/3SVPQi9Yu9nRbFPRPpR45YFXkAsyKyOgmPbDuDFj1tpBQqr+1cjm wpa5M0RqPB+gxv2MLWFENA==; Original-Received: from [87.69.77.57] (port=2340 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 1ojjvx-0005HR-3T; Sat, 15 Oct 2022 12:22:45 -0400 In-Reply-To: <87edv96q4j.fsf@posteo.net> (message from Philip Kaludercic on Sat, 15 Oct 2022 15:52:28 +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:297795 Archived-At: > From: Philip Kaludercic > Cc: emacs-devel@gnu.org > Date: Sat, 15 Oct 2022 15:52:28 +0000 > > Philip Kaludercic writes: > > > - The ability to update a package using `package-upgrade'[0] > > [...] > > > [0] This feature is currently broken because it tries to use `vc-pull' > > which refuses to work if any changes have been made. This is an > > issue as package-vc-fetch tries to modify the list of ignored files > > in a repository (think of .gitignore). It will either be necessary > > to change how vc-pull works or try to do something with > > vc-log-incoming + vc-merge. > > Does anyone know if it is possible to do this? Where is the code which fails vc-pull if there are changes in the working tree? is it specific to some backend, perhaps? The doc string says: On a non-distributed version control system, update the current fileset to the tip revisions. For each unchanged and unlocked file, this simply replaces the work file with the latest revision on its branch. If the file contains changes, any changes in the tip revision are merged into the working file. Note that last sentence. So this ought to work, and if it doesn't, it's a bug, I guess? >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? Or am I missing something?