← Previous day | Index | Channel Index | Today | Next day → | Search | Google Search | Plain-Text | plain, newest first
All times shown according to UTC.
| Time | Nick | Message |
|---|---|---|
| 01:05 | twb joined #darcs | |
| 01:44 | sm joined #darcs | |
| 02:03 | blackdog joined #darcs | |
| 02:04 | blackdog | i'm trying to apply an old darcs patch against GHC, but the context appears to be wrong - i'm missing a commit that used to be in the repo, but has evidently been backed out or coalesced or something. Is there some way to make darcs do a best-effort match with the hunks in the bundle? |
| 02:06 | sm | blackdog: what if you remove all the context (and hash) from the patch |
| 02:07 | blackdog | it sits and spins. I gave up after half an hour. |
| 02:07 | Starts saying "Merging X/21430", but got stuck at about 19000, i think | |
| 02:07 | i'm using 2.2.1 | |
| 02:23 | rasfar left #darcs | |
| 03:05 | Jerri_ joined #darcs | |
| 03:20 | blackdog | same thing with 2.3.1 |
| 03:23 | twb | If that patch doesn't exist in any public repos, that's the point at which I'd just re-record it with spoofed date and author (darcs record --pipe). |
| 03:55 | blackdog | twb: the problem is that i don't have the repo it came from either - i just have the bundle |
| 03:56 | (it's an old patch) | |
| 03:56 | is there a better way than manually pulling out the hunks and applying each? | |
| 03:56 | twb | blackdog: yeah, and unfortunately the patch bundle doesn't include context, right? |
| 03:56 | blackdog | not valid context, no |
| 03:56 | twb | I mean context lines |
| 03:56 | blackdog | yes, it does |
| 03:56 | twb | Otherwise you could just patch -p1 <foo.dpatch |
| 03:57 | blackdog | it's in darcs bundle format, though |
| 03:57 | twb | Yeah, that's what I meant. |
| 03:57 | blackdog | if i try the patch command, patch just tells me i'm talking gibberish |
| 03:57 | oh, you mean patch context, not the darcs "Context: " stuff. right. | |
| 04:02 | hm, hang on. the hunk format seems to have leading and trailing context. is there a reason you can't apply that directly? | |
| 04:46 | felipe joined #darcs | |
| 06:25 | adu joined #darcs | |
| 06:59 | tibbe joined #darcs | |
| 08:02 | darcscommitbot joined #darcs | |
| 08:03 | darcswikibot joined #darcs | |
| 08:14 | tibbe_ joined #darcs | |
| 08:18 | lelit joined #darcs | |
| 08:48 | felipe joined #darcs | |
| 09:45 | intripoon joined #darcs | |
| 10:42 | tibbe_ joined #darcs | |
| 11:51 | lelit joined #darcs | |
| 11:51 | MarcWeber joined #darcs | |
| 11:51 | lisppaste2 joined #darcs | |
| 11:51 | karlpinc joined #darcs | |
| 11:51 | kolibrie joined #darcs | |
| 11:51 | faheem joined #darcs | |
| 11:51 | int-e joined #darcs | |
| 11:51 | Jaak joined #darcs | |
| 11:51 | C-Keen joined #darcs | |
| 11:52 | lelit joined #darcs | |
| 11:53 | kolibrie joined #darcs | |
| 11:53 | faheem joined #darcs | |
| 11:54 | MarcWeber joined #darcs | |
| 11:54 | int-e joined #darcs | |
| 11:54 | karlpinc joined #darcs | |
| 12:05 | kpreid_ joined #darcs | |
| 13:53 | kpreid_ joined #darcs | |
| 14:03 | jbe` joined #darcs | |
| 14:29 | rasfar joined #darcs | |
| 14:36 | darcswikibot | 03 Dec 14:35 - added cross reference to faq entry on ghci issue (mf78) |
| 14:37 | 03 Dec 14:36 - added cross reference to tips page entry on ghci issue (mf78) | |
| 14:42 | rasfar | Igloo, Heffalump: thanks once again for your help, with attaching author/date info to nodes of a parse tree. I do believe it's working. |
| 14:42 | adu joined #darcs | |
| 14:47 | Igloo | cool |
| 15:46 | gbeshers joined #darcs | |
| 15:57 | kpreid_ joined #darcs | |
| 16:16 | darcswikibot | 03 Dec 16:14 - escape backslashes in windows path (abayley) |
| 16:34 | sm joined #darcs | |
| 17:14 | lispy joined #darcs | |
| 17:16 | eivuokko joined #darcs | |
| 17:25 | gwern joined #darcs | |
| 17:34 | lispy joined #darcs | |
| 17:39 | kpreid_ joined #darcs | |
| 18:05 | lispy | hello |
| 18:05 | How do I push patches to the wiki? | |
| 18:15 | Okay. pushing to the repository is way harder than I dreamed it would be | |
| 18:15 | er, the wiki repository | |
| 18:15 | so I ended up clicking edit on the wiki page and pasting in my changes | |
| 18:15 | But that's pretty suboptimal for me | |
| 18:16 | so, help pushing to the wiki repo would be appreciated :) | |
| 18:17 | darcswikibot | 03 Dec 18:15 - add more details (dagit) |
| 18:23 | arjanb joined #darcs | |
| 20:27 | Heffalump | hangon, I'll check.. |
| 20:28 | gitit darcs.net:DarcsWiki |
|
| 20:29 | push to that, but you may need to be setup for it first | |
| 20:30 | I just copied your ssh key across from the darcs-unstable account | |
| 20:46 | tibbe joined #darcs | |
| 20:54 | mornfall | lispy: darcs push gititdarcs.net:DarcsWiki |
| 20:58 | Heffalump | I said that (not quite in so many words) :-) |
| 20:58 | mornfall | Sorry I am blind. |
| 20:59 | For some reason irssi colored your nick the same as join/part notices and I missed the whole block (it starts and ends with such notices and I haven't had the presence of mind to look inbetween)... | |
| 21:00 | I should fix my coloring script... | |
| 21:00 | Heffalump | that does seem like rather odd behaviour :-) |
| 21:01 | sm | it should be safe to darcs mv B A; darcs mv C B, or darcs mv B A; darcs add B, in a single commit, right ? |
| 21:01 | Heffalump | yes - they'll get coalesced |
| 21:01 | oh, no they won't | |
| 21:01 | but yes it's safe | |
| 21:01 | (they won't get coalesced because that's clearly inappropriate :-) | |
| 21:01 | sm | thanks |
| 21:06 | lispy | Heffalump: thanks |
| 22:28 | amuck_ joined #darcs | |
| 22:36 | amuck__ joined #darcs | |
| 22:47 | kpreid_ joined #darcs | |
| 23:00 | lispy joined #darcs | |
| 23:42 | nomeata joined #darcs |
← Previous day | Index | Channel Index | Today | Next day → | Search | Google Search | Plain-Text | plain, newest first