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.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, NICE_REPLY_A,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 7492 invoked from network); 20 May 2022 03:01:21 -0000 Received: from 9front.inri.net (168.235.81.73) by inbox.vuxu.org with ESMTPUTF8; 20 May 2022 03:01:21 -0000 Received: from mail.posixcafe.org ([45.76.19.58]) by 9front; Thu May 19 22:59:52 -0400 2022 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=posixcafe.org; s=20200506; t=1653015588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rezg/sKTVn44KiZM58IyzBLrqjVJDPIxcOkKsMbMjo4=; b=ZeJTgYePVCHidxSMf0U5YDJkmbOeNShYjsHZtgjkObXcGPj/GRu9OoJXWdJcEGRia1l71f tcAg01zh5nlNvhkwLQFJrfn5cnF4w5dBqURnYzgQ7KcSU2n/sjAYPhwU7an7Dx8ikvRf6r T3Rq+2QrLom3OpjxNB5q+gmowOPdCnM= Received: from [192.168.168.200] (161-97-228-135.lpcnextlight.net [161.97.228.135]) by mail.posixcafe.org (OpenSMTPD) with ESMTPSA id cb952cf4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <9front@9front.org>; Thu, 19 May 2022 21:59:48 -0500 (CDT) Message-ID: <5f204563-8dc4-640a-2a32-05b664e92814@posixcafe.org> Date: Thu, 19 May 2022 20:59:43 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Content-Language: en-US To: 9front@9front.org References: <725EE73A29B715C8A4819C0FEA41C786@eigenstate.org> <5ea00ae7-2566-4640-ec0b-2180afb2009b@fjrhome.net> <20220519200203.66cae0d6@spruce.localdomain> <9a37d3cc-d95a-b019-8d34-8f815a8591f4@fjrhome.net> From: Jacob Moody In-Reply-To: <9a37d3cc-d95a-b019-8d34-8f815a8591f4@fjrhome.net> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit List-ID: <9front.9front.org> List-Help: X-Glyph: ➈ X-Bullshit: webscale template app method control Subject: Re: [9front] 9front, git and mercurial. Reply-To: 9front@9front.org Precedence: bulk On 5/19/22 20:35, Frank D. Engel, Jr. wrote: > As I said earlier in the thread, my script still has the "hg" commands. > > I do have git installed. > > I may try this suggestion tomorrow as it looks like that script contains > the logic to switch the repository to git. > > > An update on my response to the other fork in this thread: I ran hg > update from /dist/plan9front and it updated 140 files, but > /bin/sysupdate still contains the hg commands. You need to slow down and understand the state of your system. First from your other response: > abort: untracked file in working directory differs from file in > requested revision: 'sys/lib/git/common.rc' This is hg complaining that an update would thrash a file that your current revision knows nothing about. Git didn't used to be tracked, you installed it manually, now it's tracked. Uninstall your current version and use the tracked one. Updating is a two part step, you fetch updates from the remote(hg pull), then you update your local files(hg update). As per your hg log posted earlier you are up to date with the remote(you pulled at some point), you are just missing the hg update step. When you attempted to earlier, it bailed due the issue you posted about above. Fix the current tree then update again. When you are updating you need to have the .hg folder bound onto the root. .hg is stored in /dist/plan9front but when managing the source tree it expects to be bound onto root. You can see this done in sysupdate. You can do the binding manually like this: bind -ac /dist/plan9front / > I then did a cd /sys/src followed by mk all then mk install - no change > to /bin/sysupdate Look at your namespace, /bin/sysupdate is a rc script. It it not built from /sys/src it is bound directly in to /bin from /rc/bin.