[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] Re: various faults in the 0.10 netsync implementation
|
From: |
Christof Petig |
|
Subject: |
[Monotone-devel] Re: various faults in the 0.10 netsync implementation |
|
Date: |
Fri, 05 Mar 2004 09:23:04 +0100 |
|
User-agent: |
Mozilla/5.0 (X11; U; Linux ppc; de-AT; rv:1.6) Gecko/20040122 Debian/1.6-1 |
graydon hoare schrieb:
(christof: this also includes you; the adler32 change I settled on is
not the one you suggested, so you will probably get broken checksums
until you fetch again)
I fetched again and wondered about the following message:
$ monotone update
monotone: selected update target 9fa1750d2c929f7fd3ce6cebba108904e1a39a82
monotone: misuse: manifest merge failed, no update performed
**** error return code 1
********** errors detected; see standard output for details ***********
not really informative, is it? --verbose shows what's up:
monotone: merging 52 left, 52 right extents
monotone: conflicting edits: changed 25[0] ' inline void in(u8 c)' vs.
changed 24[0] ' inline void in(signed char c)'
monotone: conflict detected. no merge.
monotone revert; monotone update did the trick :-/
Christof