Re: [9front] 9front, git and mercurial.

["Frank D. Engel, Jr." <fde101@fjrhome.net>]

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. <fde101@fjrhome.net>:
>> 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
>
>