9front - general discussion about 9front
 help / color / mirror / Atom feed
From: Jacob Moody <moody@mail.posixcafe.org>
To: 9front@9front.org
Subject: Re: [9front] 9front, git and mercurial.
Date: Thu, 19 May 2022 20:59:43 -0600	[thread overview]
Message-ID: <5f204563-8dc4-640a-2a32-05b664e92814@posixcafe.org> (raw)
In-Reply-To: <9a37d3cc-d95a-b019-8d34-8f815a8591f4@fjrhome.net>

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.



      reply	other threads:[~2022-05-20  3:01 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <89F3ABF218EE52FAE7605F9B07728487@eigenstate.org>
     [not found] ` <1275338a-65f0-61c2-8162-ba7c93fa2493@fjrhome.net>
     [not found]   ` <YoU7OpruuHGcQYUj@wopr>
     [not found]     ` <dbbd3656-69c9-b71b-2d08-07912ad5326d@fjrhome.net>
2022-05-18 19:48       ` Frank D. Engel, Jr.
2022-05-18 20:03         ` Frank D. Engel, Jr.
2022-05-19  1:51         ` ori
2022-05-19  8:20           ` Frank D. Engel, Jr.
2022-05-19 17:46             ` Kurt H Maier
2022-05-19 18:41               ` Frank D. Engel, Jr.
2022-05-20  1:33                 ` Jacob Moody
2022-05-20  2:25                   ` Frank D. Engel, Jr.
2022-05-20  4:37                     ` ori
2022-05-20  9:15                       ` Frank D. Engel, Jr.
2022-05-20 14:30                         ` ori
2022-05-20 15:00                           ` Frank D. Engel, Jr.
2022-05-20  1:02             ` Amavect
2022-05-20  2:35               ` Frank D. Engel, Jr.
2022-05-20  2:59                 ` Jacob Moody [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5f204563-8dc4-640a-2a32-05b664e92814@posixcafe.org \
    --to=moody@mail.posixcafe.org \
    --cc=9front@9front.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).