From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=NICE_REPLY_A, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 24841 invoked from network); 20 May 2022 09:18:44 -0000 Received: from 9front.inri.net (168.235.81.73) by inbox.vuxu.org with ESMTPUTF8; 20 May 2022 09:18:44 -0000 Received: from dpmailmta01.doteasy.com ([65.61.219.11]) by 9front; Fri May 20 05:16:03 -0400 2022 X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=192.168.101.81; Received: from dpmailrp01.doteasy.com (unverified [192.168.101.81]) by dpmailmta01.doteasy.com (DEO) with ESMTP id 91653790-1394429 for <9front@9front.org>; Fri, 20 May 2022 02:15:52 -0700 Return-Path: Received: from dpmail01.doteasy.com (dpmail01.doteasy.com [192.168.101.1]) by dpmailrp01.doteasy.com (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTP id 24K9Fp3l026496 for <9front@9front.org>; Fri, 20 May 2022 02:15:52 -0700 X-SmarterMail-Authenticated-As: fde101@fjrhome.net Received: from [192.168.1.75] (pool-173-67-134-144.hrbgpa.fios.verizon.net [173.67.134.144]) by dpmail01.doteasy.com with SMTP; Fri, 20 May 2022 02:15:32 -0700 Message-ID: Date: Fri, 20 May 2022 05:15:26 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Content-Language: en-US To: 9front@9front.org References: <5654992160E4622D77AFACC15F3311BE@eigenstate.org> From: "Frank D. Engel, Jr." In-Reply-To: <5654992160E4622D77AFACC15F3311BE@eigenstate.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Exim-Id: cf2e83b9-587b-427c-a8e0-6f9689ef940c X-Bayes-Prob: 0.9998 (Score 4, tokens from: base:default, @@RPTN) X-CanIt-Geo: No geolocation information available for 192.168.101.1 X-CanItPRO-Stream: base:default X-Canit-Stats-ID: 017wVfPnc - 1a2043239abb - 20220520 X-Scanned-By: CanIt (www . roaringpenguin . com) on 192.168.101.81 X-Originating-IP: 192.168.101.81 List-ID: <9front.9front.org> List-Help: X-Glyph: ➈ X-Bullshit: callback CSS optimizer Subject: Re: [9front] 9front, git and mercurial. Reply-To: 9front@9front.org Precedence: bulk I first tried removing /sys/lib/git/common.rc and running "hg update" again (I believe I had already run the command last time to bind /dist/plan9front to / but in any case I did so first this time). The hg update command no longer complained about an untracked file when run from /sys/src.  It did not make any changes, however, whether I ran it from /, /sys/src or /dist/plan9front. Removing the file did break my git installation (which I had expected), but it did not result in the local install being replaced by the tracked one: glenda@brains1% cd /sys/src glenda@brains1% hg ident c8bec6f5ee1e+ tip glenda@brains1% rm /sys/lib/git/common.rc glenda@brains1% hg up 0 files updated, 0 files merged, 0 files removed, 0 files unresolved glenda@brains1% cd / glenda@brains1% hg up 0 files updated, 0 files merged, 0 files removed, 0 files unresolved glenda@brains1% cat /bin/sysupdate #!/bin/rc rfork en source=https://code.9front.org/hg/plan9front cd / if(! test -d .hg)     bind -ac /dist/plan9front / while(! ~ $#* 0){     switch($1){     case -i         hg incoming $source     case *         echo usage: sysupdate '[-i]' >[1=2]         exit usage     }     shift } hg -v pull -u $source glenda@brains1% git/pull /sys/lib/git/common.rc: /bin/git/pull:3: .: can't open: '/sys/lib/git/common.rc' does not exist Next I ran "hg status" and looked through the list of things to change - I noticed a number of things that were local but which were important to keep, and was concerned that "hg up -C" would remove them, so I backed up the ones I knew I needed to a subdirectory under /usr/glenda then ran "hg up -C" from /sys/src. This made 142 updates, so I ran mk all followed by mk install to apply those changes. Next I checked /bin/sysupdate and verified that it had finally been updated to the git version. After validating that my local updates I was concerned about were in fact still there (they were not modified by hg up -C) I ran the new /bin/sysupdate. This produced what appeared to me to be a warning and an error, plus a message that .hg could be removed (so I did). I tried running sysupdate again and continue to receive the error: glenda@brains1% /bin/sysupdate end of line for hg: moving to git.     fetching snapshot... fs 281324: warning: process exceeds 100 file descriptors     pulling with git... /bin/git/pull: no remote to pull from got git: you may remove /dist/plan9front/.hg glenda@brains1% rm -rf /dist/plan9front/.hg glenda@brains1% sysupdate /bin/git/pull: no remote to pull from glenda@brains1% On 5/20/22 12:37 AM, ori@eigenstate.org wrote: > Quoth Frank D. Engel, Jr. : >> If I cd /sys/src then hg update I get: >> >> >> abort: untracked file in working directory differs from file in >> requested revision: 'sys/lib/git/common.rc' >> >> > ok -- the manually installed version of git > is conflicting with the version that sysupdate > wants to add. > > Do you have local changes? > > hg up -C > > will bring you to the expected revision, > but will blow away local changes. > > you can also likely remove or clean up > /sys/lib/git/common.rc > >