[Expo-tech] We can push anything to expoweb.

[Philip Sargent (Gmail)]

Can someone fix this?

 

expo at expo:~/expoweb$ hg update

abort: outstanding merge conflicts

 

I tried, even deleting what I thought was the file causing the problem, but
it's still broken.

We can push anything to expoweb.

 

Philip

 

From: Philip Sargent (Gmail) [mailto:philip.sargent at gmail.com] 
Sent: 26 March 2020 23:55
To: 'Wookey'
Cc: 'Sam Wenham'; 'Michael Sargent'
Subject: abort: outstanding merge conflicts

 

Sorry guys. I have screwed up this file and got a merge conflict I can't fix

for handbook/computing/x-todo.html

 

expo at expo:~/expoweb$ hg update

abort: outstanding merge conflicts

 

expo at expo:~/expoweb$ hg status

years/2010/accounts/config: Permission denied

years/2010/accounts/initial: Permission denied

years/2010/accounts/html: Permission denied

years/2010/accounts/splits: Permission denied

M handbook/computing/x-todo.html

! years/2010/accounts/config/meets

!... lots more but no change as of today

 

 

-----Original Message-----
From: Philip Sargent (Gmail) [mailto:philip.sargent at gmail.com] 
Sent: 26 March 2020 16:02
To: 'Wookey'
Cc: 'Sam Wenham'
Subject: permissions on expo server

 

Sorry to bother you Sam, as I know you must be working 30 hours a day

working on getting university academics online to work remotely...

 

Maybe Wookey is best to answer this anyway.

 

I tried to do an "Edit this page" thing.

It failed.

I changed the ownership and group ownership of the relevant directory to

www-data:www-data

It succeeded.

 

Then I tried to do the hg commit thing, so that my new page went into

mercurial.

I found a whole load of un-updated files -- all due to me pushing stuff to

mercurial without doing hg update

BUT when I tried to do hg update I got this:

 

update failed to remove photos/wook91.jpg: Permission denied!

update failed to remove photos/wookey.jpg: Permission denied!

.... many more...

update failed to remove photos/wstead.jpg: Permission denied!

abort: Permission denied:

/home/expo/repositories/hg/expoweb/documents/troggle-tables.jpg

 

So I tried

expo at expo:~/expoweb$ su psargent

 

psargent at expo:/home/expo/expoweb$ hg update

not trusting file /home/expo/repositories/hg/expoweb/.hg/hgrc from

untrusted user expo, group expo

not trusting file /home/expo/repositories/hg/expoweb/.hg/hgrc from

untrusted user expo, group expo

abort: could not lock working directory of

/home/expo/repositories/hg/expoweb: Permission denied

 

psargent at expo:/home/expo/expoweb$ sudo hg update

not trusting file /home/expo/repositories/hg/expoweb/.hg/hgrc from

untrusted user expo, group expo

not trusting file /home/expo/repositories/hg/expoweb/.hg/hgrc from

untrusted user expo, group expo

12 files updated, 0 files merged, 144 files removed, 0 files unresolved

psargent at expo:/home/expo/expoweb$

 

It shouldn't require sudo to do this surely ?

 

 

There is something  funny going on with expoweb/years/2010/accounts too:

expo at expo:~/expoweb/years/2010/accounts$ ls -tlA

total 24

drwx--S--- 2 www-data www-data 4096 May 25  2016 config

drwx--S--- 2 www-data www-data 4096 Oct 24  2015 html

drwx--S--- 2 www-data www-data 4096 Oct 24  2015 initial

-rwxr-xr-x 1 www-data www-data  179 Oct 24  2015 split-by-days-on-expo

drwx--S--- 2 www-data www-data 4096 Oct 24  2015 splits

-rwxr-xr-x 1 www-data www-data   88 Oct 24  2015 todohg commit 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.wookware.org/pipermail/expo-tech/attachments/20200327/2dd2f5f4/attachment.htm>