darcs

Issue 753 apply => bug in get_extra commuting patch

Title apply => bug in get_extra commuting patch
Priority bug Status chatting
Superseder Nosy List Serware, beschmi, dagit, droundy, kolmodin, kowey, tim, tommy, tux_rocker, zooko
Assigned To Topics Confirmed, Darcs2

Created on 2008-03-21.06:07:26 by zooko, last changed 2008-05-02.17:17:34 by tux_rocker.

Files
File name Uploaded Type Edit Remove
Allmydata GNUmakefile signal-error.txt zooko, 2008-03-21.06:07:24 text/plain
kolmodin-non-working.eml kolmodin, 2008-04-28.18:18:11 message/rfc822
kolmodin-working.dpatch kolmodin, 2008-04-28.18:18:25 application/octet-stream
non-working-decoded.dpatch kowey, 2008-05-01.08:17:16 application/octet-stream
Messages (mbox)
msg3945 (view) Author: zooko Date: 2008-03-21.06:07:25
When I try to apply the attached patch to the http://allmydata.org/ 
source/tahoe/trunk repository, using darcs-2-pre, I get:

-------
HACK wonwin-mcbrootles-computer:~/playground/allmydata/tahoe/trunk$  
darcs apply /Users/wonwinmcbrootles/Desktop/Allmydata\ GNUmakefile\  
signal-error.txt
darcs: bug in get_extra commuting patch:
Tue Mar 18 17:15:36 MDT 2008  robk-tahoe@allmydata.com
   * confwiz: reworked confwiz look and feel

   this changes the confwiz to have a look and feel much more consistent
   with that of the innosetup installer it is launched within the  
context
   of.  this applies, naturally, primarily to windows.
msg3951 (view) Author: droundy Date: 2008-03-21.16:22:54
I'm not sure what's going on here, but I do notice that darcs 1.0.9rc1 can't
parse this patch bundle, so I presume it's generated by a darcs-2 version? Any
chance we could see the repository that generated this patch bundle?

David
msg3955 (view) Author: zooko Date: 2008-03-21.18:20:56
On Mar 21, 2008, at 10:22 AM, David Roundy wrote:

> I'm not sure what's going on here, but I do notice that darcs  
> 1.0.9rc1 can't
> parse this patch bundle, so I presume it's generated by a darcs-2  
> version? Any
> chance we could see the repository that generated this patch bundle?

Hm, it was generated by a new contributor to allmydata.org, using  
this binary:

http://eric.kow.free.fr/download/darcs-1.0.9-i386-linux.gz

Which we found on darcs.net:

http://wiki.darcs.net/DarcsWiki/CategoryBinaries#head- 
c038d6893073983986c777aec342eeead0d3d4da

However, there could be some kind of problems with his system.  Also,  
he hit Down Arrow on his keyboard when typing in his e-mail address.   
Are the funny Down Arrow control characters in that field the reason  
that it doesn't parse?

If I ever talk to him again, I'll ask him if he can give us the 30 MB  
compressed tarball of that repository from his machine, if he still  
has it...

Regards,

Zooko
msg4000 (view) Author: droundy Date: 2008-03-25.14:47:36
I don't think the down arrow could cause darcs itself trouble, but it is quite
possible that it made this patch tricky to send via an email program.  It could
even expose a bug in our mime encoding (which as I understand things is not
particularly correct).

David
msg4365 (view) Author: tim Date: 2008-04-26.22:35:55
I just ran into the same error message and was about to report it. I'm using
darcs  1.0.9rc1. For me it happens with a GHC libraries/base repo. I can upload
the offending repo / patch if it helps.
-Tim
msg4366 (view) Author: zooko Date: 2008-04-27.01:56:51
Please do, especially if it is small or if you can make a small repo which
exhibits the same behavior.
msg4372 (view) Author: kolmodin Date: 2008-04-28.18:18:11
I just ran into the same bug too, using darcs-2.
Got a patch by mail, saved the whole mail (using Thunderbird) and tried to
apply, failure.

darcs: bug in get_extra commuting patch:
Sun Nov 25 18:44:57 CET 2007  der_eq@freenet.de
  * Added patches to make regex-posix work with 6.8

It worked when I just saved the attached file and applied that.
The repo is http://www.haskell.org/~gentoo/gentoo-haskell/

I'm attaching both files here.
msg4410 (view) Author: kowey Date: 2008-04-30.19:33:31
Lennart, when I try applying this patch, it says that it has already been
applied.  Do you think you could reconstruct a version of the repository where
this failure happens and put it online?  Thanks!
msg4417 (view) Author: kolmodin Date: 2008-05-01.00:18:41
When I try to apply the non-working patch to the repo it doesn't work, even if
the patch is already applied (still using darcs-2).

If you still would like a repo without the patches, it's easy to construct one
yourself by unrecording the patches in the bundle.

Cheers.
msg4418 (view) Author: kowey Date: 2008-05-01.08:02:08
Ah, sorry! I had gotten confused and tried to apply kolmodin-working.dpatch
(which, sure enough... worked).  Yes, when I try to apply
kolmodin-non-working.eml, I indeed get the bug in get_extra commuting patch error.

I'd be interested to see if a non-bytestring version of darcs can apply this.
msg4419 (view) Author: kowey Date: 2008-05-01.08:17:16
You might be interested to hear this follow-up: I've installed the program
mimedecode on Ubuntu.  When I ran it on the non-working patch, it produced a
file which was very similar to the working patch, except that the piece of
context that talks about this file:

Sun Nov 25 18:44:57 CET 2007  der_eq@freenet.de
  * Added patches to make regex-posix work with 6.8

had an extra newline after the patch comment.  Removing that newline by hand
allowed the patch to apply cleanly.

I guess we need to looking to the bit of darcs code that MIME encodes these
patch bundles?
msg4430 (view) Author: kowey Date: 2008-05-01.16:06:40
Tim: I have a hunch that your bug is just issue279, which has been fixed by
darcs2, and that the one zooko and kolmodin are experiencing is different (and
hopefully more minor than it looks).  So it would be good to see if you still
get the same error message with darcs 2.

Browse related patches: unstable | stable

History
Date User Action Args
2008-03-21 06:07:26zookocreate
2008-03-21 16:22:55droundysetpriority: bug
nosy: droundy, tommy, beschmi, kowey, zooko
status: unread -> chatting
messages: + msg3951
2008-03-21 18:20:58zookosetnosy: droundy, tommy, beschmi, kowey, zooko
messages: + msg3955
2008-03-25 14:47:38droundysetnosy: droundy, tommy, beschmi, kowey, zooko
messages: + msg4000
2008-04-26 22:35:57timsetnosy: + tim
messages: + msg4365
2008-04-27 01:56:53zookosetnosy: droundy, tommy, beschmi, kowey, zooko, tim
messages: + msg4366
2008-04-28 18:18:13kolmodinsetfiles: + kolmodin-non-working.eml
nosy: + kolmodin, dagit
messages: + msg4372
2008-04-28 18:18:26kolmodinsetfiles: + kolmodin-working.dpatch
nosy: droundy, tommy, beschmi, kowey, zooko, dagit, tim, kolmodin
2008-04-30 19:33:35koweysetstatus: chatting -> need-info
nosy: + Serware
topic: + Darcs2
messages: + msg4410
title: darcs: bug in get_extra commuting patch: -> Darcs2: apply => bug in get_extra commuting patch
2008-05-01 00:18:43kolmodinsetnosy: droundy, tommy, beschmi, kowey, zooko, dagit, tim, Serware, kolmodin
messages: + msg4417
2008-05-01 08:02:19koweysetstatus: need-info -> chatting
nosy: droundy, tommy, beschmi, kowey, zooko, dagit, tim, Serware, kolmodin
topic: + Confirmed
messages: + msg4418
title: Darcs2: apply => bug in get_extra commuting patch -> apply => bug in get_extra commuting patch
2008-05-01 08:17:22koweysetfiles: + non-working-decoded.dpatch
nosy: droundy, tommy, beschmi, kowey, zooko, dagit, tim, Serware, kolmodin
messages: + msg4419
2008-05-01 16:06:45koweysetnosy: droundy, tommy, beschmi, kowey, zooko, dagit, tim, Serware, kolmodin
messages: + msg4430
2008-05-02 17:17:34tux_rockersetnosy: + tux_rocker