Hi!

I tried to merge from Matthieu.
I did it as always from emacs.

I got the following two lines:
* build reference tree for [EMAIL PROTECTED]
* from archive cached: [EMAIL PROTECTED]

Then the process just stopped without any visible information.


So I tried it from the command line and got the following:

% tla star-merge --three-way [EMAIL PROTECTED]/xtla--main--0.1--patch-259
* build reference tree for [EMAIL PROTECTED]
* from archive cached: [EMAIL PROTECTED]

********************************
 MISMATCHED ARCHIVE CHECKSUM

  archive: [EMAIL PROTECTED]
  revision: xtla--main--0.1--patch-233
  file: xtla--main--0.1--patch-233.tar.gz

  expected: b8b6deb78f2947f26fd39b20eff87ada
  got: e84c9ec0f59976c0e0c10c16dab4f1a0

********************************

What is going on here?

Stefan.


Reply via email to