darcs

Issue 1217 darcs put fails with 'darcs failed: Malformed patch bundle: '{' is not 'Context:' '

Title darcs put fails with 'darcs failed: Malformed patch bundle: '{' is not 'Context:' '
Priority bug Status duplicate
Milestone Resolved in
Superseder darcs put tries to convert to darcs-2-format?
View: 1255
Nosy List darcs-devel, dmitry.kurochkin, gour, kowey, thorkilnaur, zooko
Assigned To
Topics

Created on 2008-11-10.09:44:03 by gour, last changed 2009-08-27.14:15:07 by admin.

Files
File name Uploaded Type Edit Remove
logs.tar.bz2 zooko, 2009-01-15.02:18:37 text/plain
Messages
msg6631 (view) Author: gour Date: 2008-11-10.09:44:01
Hi!

Attempt to do 'darcs put' from local maching to the server fails...

Here are infos about repositories & darcs version on both local (nitai) and
remote (s4) machines...

**********
local repo
----------
 
[gour@nitai darcsum] darcs show repo
          Type: darcs
        Format: darcs-1.0
          Root: /home/gour/repos/darcs/darcsum
      Pristine: PlainPristine "_darcs/pristine"
         Cache: thisrepo:/home/gour/repos/darcs/darcsum
Default Remote: gour@s4.wservices.ch:/home/gour/public_html/darcs/ds
   Num Patches: 153
 
 
[gour@nitai darcsum] darcs --exact-version
darcs compiled on Jun 24 2008, at 10:34:53
# configured Mon Jun 23 18:19:52 PDT 2008
./configure /usr/local/share/config.site /usr/local/etc/config.site
 
Context:
 
[TAG 2.0.2
David Roundy <droundy@darcs.net>**20080624012041] 
 
 
remote repo
-----------
 
[gour@s4 ds] darcs show repo
          Type: darcs
        Format: hashed, darcs-2
          Root: /home/gour/public_html/darcs/ds
      Pristine: HashedPristine
         Cache: thisrepo:/home/gour/public_html/darcs/ds
   Num Patches: 0
 
[gour@s4 ds] darcs --exact-version
darcs compiled on Oct 29 2008, at 05:56:10
# configured Wed Oct 29 05:54:04 CDT 2008
./configure /usr/local/share/config.site /usr/local/etc/config.site
 
Context:
 
[TAG 2.1.0
Eric Kow <E.Y.Kow@brighton.ac.uk>**20081009120532]
 
 
[gour@nitai darcsum] darcs put --debug-verbose
gour@s4.wservices.ch:/home/gour/public_html/darcs/ds
Creating repository
Creating repository
Beginning identifying repository .
Done identifying repository .
ssh gour@s4.wservices.ch darcs initialize
--repodir='/home/gour/public_html/darcs/ds' 
Disabling progress reports...
Reenabling progress reports.
Beginning identifying repository .
Done identifying repository .
Identified darcs-1 repo: /home/gour/repos/darcs/darcsum
Beginning reading inventory of repository /home/gour/repos/darcs/darcsum
Done reading inventory of repository /home/gour/repos/darcs/darcsum
Beginning reading inventory of repository /home/gour/repos/darcs/darcsum
Done reading inventory of repository /home/gour/repos/darcs/darcsum
Applying patches in new repository...
Disabling progress reports...
ssh gour@s4.wservices.ch darcs apply --all --debug --repodir
'/home/gour/public_html/darcs/ds'
Beginning identifying repository .
Done identifying repository .
Identified darcs-2 repo: /home/gour/public_html/darcs/ds
 
darcs failed:  Malformed patch bundle: '{' is not 'Context:'
 
addfile ./darcsum.el
hunk ./darcsum.el 1
+;;; darcsum.el --- a pcl-cvs like interface for managing darcs patches
+
+;; Copyright (C) 2004  John Wiegley
 
[...]
 
[darcsum-boring: fixed darcsum-line-path usage, proposed regexp for dir
pekka+darcsum AT pessi DOT fi**20080516130615] {
hunk ./darcsum.el 1495
-	 (path (get-text-property (point) 'darcsum-path)))
+	 (path (get-text-property (point) 'darcsum-line-path)))
hunk ./darcsum.el 1501
-       (setq path (concat "(^|/)" (regexp-quote path) "($|/)")))
+       (setq path (concat "(^|/)" path "($|/)")))
}
 
Context:
 
Patch bundle hash:
831c0236b5886478773d8a478bb34fa77a7b2a0a
 
--=_--
 
.
 
 
Reenabling progress reports.
Apply failed!

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


Sincerely,
Gour
msg7093 (view) Author: zooko Date: 2009-01-14.21:30:10
It looks like my issue1255 might be related.
msg7096 (view) Author: zooko Date: 2009-01-14.21:31:11
issue1298 was a duplicate of this one.
msg7098 (view) Author: zooko Date: 2009-01-14.21:33:39
In addition to getting this failure with the "zooko_n_cgalvan/buildbot" 
repository described in issue1298, I just got this failure with vmiklos's darcs-
hooks repository.  I'm still using darcs-2.1.2 on both ends.

To reproduce, get vmiklos's darcs-hooks repository from: http://vmiklos.hu/project/darcs-hooks

Then do a "darcs put" of that repository to a remote host.
msg7099 (view) Author: zooko Date: 2009-01-15.02:18:37
Okay I upgraded both sides to the latest darcs-2.2-pre and got the same error.  
Here is the stdout (log.txt) and the stderr (log2.txt) from "darcs put -v -v -v --
debug":
Attachments
msg7102 (view) Author: kowey Date: 2009-01-15.09:03:35
I declare this bug to be a duplicate of issue1255.  Please re-open if you
disagree.  (thanks to zooko for making the links).

For what it's worth, it may be a useful experiment to try creating a darcs-1
patch (using a darcs 2 binary) and apply it to a darcs-2 repo... the idea being
to see if we get a Malformed patch bundle complaint.
History
Date User Action Args
2008-11-10 09:44:03gourcreate
2009-01-14 21:30:12zookosetstatus: unread -> unknown
nosy: + zooko
messages: + msg7093
2009-01-14 21:31:01zookolinkissue1298 superseder
2009-01-14 21:31:13zookosetnosy: kowey, zooko, dagit, simon, thorkilnaur, gour, dmitry.kurochkin
messages: + msg7096
2009-01-14 21:33:41zookosetnosy: kowey, zooko, dagit, simon, thorkilnaur, gour, dmitry.kurochkin
messages: + msg7098
2009-01-15 02:18:42zookosetfiles: + logs.tar.bz2
nosy: kowey, zooko, dagit, simon, thorkilnaur, gour, dmitry.kurochkin
messages: + msg7099
2009-01-15 09:03:38koweysetstatus: unknown -> duplicate
nosy: kowey, zooko, dagit, simon, thorkilnaur, gour, dmitry.kurochkin
superseder: + darcs put tries to convert to darcs-2-format?
messages: + msg7102
2009-08-10 23:51:11adminsetnosy: - dagit
2009-08-25 17:34:10adminsetnosy: + darcs-devel, - simon
2009-08-27 14:15:07adminsetnosy: kowey, darcs-devel, zooko, thorkilnaur, gour, dmitry.kurochkin