[darcs-devel] [issue573] corrupted repository -- indelible "conflicting local changes"

Zooko bugs at darcs.net
Mon Dec 31 18:16:58 UTC 2007


New submission from Zooko <zooko at zooko.com>:

Folks:

This is a minor disaster for me, as the central, canonical, append- 
only repository of my company and my open source project, http:// 
allmydata.org , is corrupted in a way that will probably interfere  
with our operations.  So I will be grateful for any help.

I'm trying to reproduce the problem more precisely, but basically if  
I try to push a patch that updates the "install.html" file, I get:

------- begin included stdout/stderr
HACK wonwin-mcbrootles-computer:~/playground/allmydata/tahoe/trunk$  
time darcs push -v -v -v  zooko at dev.allmydata.com:/home/darcs/tahoe
We have the following patches to push:
Mon Dec 31 07:39:07 MST 2007  zooko at zooko.com
   * docs: even further simplify and reformat install.html

Mon Dec 31 07:39:07 MST 2007  zooko at zooko.com
   * docs: even further simplify and reformat install.html
Shall I push this patch? (1/1)  [ynWvpxqadjk], or ? for help: y

Fail: <stdin>: hGetChar: end of file

We have conflicts in the following files:
./install.html
You have conflicting local changes to:
./install.html
Proceed? [yn]sending 1 change to buildmaster:
  20071231143907-92b7f-421a25c32fcb3d15709673e54367c7b2050c3774.gz
change sent successfully
Finished applying...

real    3m14.892s
user    0m0.417s
sys     0m0.171s

------- end included stdout/stderr

Note that this repository is set to reject pushes which cause  
conflicts, but despite that setting, it leaves unrecorded local  
changes in that repo after this.

I haven't so far reproduced this when pushing that same patch into an  
apparently identical repository on my local system.  I'm still trying  
to understand what is the difference between our central repo and  
this local copy.

You can probably see something about this problem for yourself by  
grepping for "install.html" in our patches:

http://allmydata.org/source/tahoe/trunk

Here are the grep results:

------- begin included output from 'grep "/install.html" in _patches'
_darcs/patches// 
20071230114717-92b7f-2055aaac4899f6389479880306906912b5de93fd.gz:addfile 
  ./install.html
_darcs/patches// 
20071230114717-92b7f-2055aaac4899f6389479880306906912b5de93fd.gz:move ./ 
install.html ./docs/install.html
_darcs/patches// 
20071230114717-92b7f-2055aaac4899f6389479880306906912b5de93fd.gz:hunk ./ 
docs/install.html 1
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 1
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 11
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 14
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 16
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 18
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 20
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 25
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 27
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 29
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 33
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 37
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 39
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 41
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 43
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 47
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 48
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 50
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 53
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 54
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 56
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 58
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 60
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 62
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 64
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 66
_darcs/patches//20071231020118-92b7f- 
de5d4867c89fc0f6f998cbc817e9bd2af2ab614e.gz:hunk ./docs/install.html 68
_darcs/patches// 
20071231143907-92b7f-421a25c32fcb3d15709673e54367c7b2050c3774.gz:hunk ./ 
docs/install.html 21
_darcs/patches// 
20071231143907-92b7f-421a25c32fcb3d15709673e54367c7b2050c3774.gz:hunk ./ 
docs/install.html 23
_darcs/patches// 
20071231143907-92b7f-421a25c32fcb3d15709673e54367c7b2050c3774.gz:hunk ./ 
docs/install.html 25
_darcs/patches// 
20071231143907-92b7f-421a25c32fcb3d15709673e54367c7b2050c3774.gz:hunk ./ 
docs/install.html 27
_darcs/patches// 
20071231143907-92b7f-421a25c32fcb3d15709673e54367c7b2050c3774.gz:hunk ./ 
docs/install.html 29
_darcs/patches// 
20071231143907-92b7f-421a25c32fcb3d15709673e54367c7b2050c3774.gz:hunk ./ 
docs/install.html 31
_darcs/patches// 
20071231143907-92b7f-421a25c32fcb3d15709673e54367c7b2050c3774.gz:hunk ./ 
docs/install.html 33
_darcs/patches// 
20071231143907-92b7f-421a25c32fcb3d15709673e54367c7b2050c3774.gz:hunk ./ 
docs/install.html 35
_darcs/patches// 
20071231143907-92b7f-421a25c32fcb3d15709673e54367c7b2050c3774.gz:hunk ./ 
docs/install.html 37
------- end included output from 'grep "/install.html" in _patches'

Regards,

Zooko

----------
messages: 2292
nosy: beschmi, droundy, kowey, tommy, zooko
status: unread
title: corrupted repository -- indelible "conflicting local changes"

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue573>
__________________________________


More information about the darcs-devel mailing list