← 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 |
|---|---|---|
| 00:56 | twb joined #darcs | |
| 01:19 | idnar joined #darcs | |
| 02:04 | kpreid_ joined #darcs | |
| 04:28 | gwern joined #darcs | |
| 04:28 | gwern joined #darcs | |
| 05:19 | JaffaCake1 joined #darcs | |
| 05:30 | judah joined #darcs | |
| 05:30 | judah left #darcs | |
| 07:19 | balor joined #darcs | |
| 08:01 | lelit joined #darcs | |
| 08:02 | darcscommitbot joined #darcs | |
| 08:03 | darcswikibot joined #darcs | |
| 08:17 | felipe joined #darcs | |
| 09:00 | gal_bolle joined #darcs | |
| 09:24 | Jaak joined #darcs | |
| 10:04 | intripoon joined #darcs | |
| 11:02 | malcolmw joined #darcs | |
| 12:06 | Igloo joined #darcs | |
| 13:18 | gal_bolle joined #darcs | |
| 13:18 | attila_lendvai joined #darcs | |
| 13:19 | attila_lendvai | hrm, i think i have a bug after a darcs2 conversion of a repo with several conflicts... |
| 13:19 | is it normal that darcs check finishes fine, but then a darcs pull ends up in "m doesn't conflict with mm in is_consistent" | |
| 13:19 | ? | |
| 13:20 | i've made sure that i've converted a merged repo of the two branches and recostructed the branches from that single conversion | |
| 13:20 | im about 90% sure that i didn't screw it up, but... | |
| 13:25 | the error happens when i record a patch in repo A and pull it into repo B which is about 100 patches ahead. this patch causes a conflict in the new repo. after that darcs pull dies with the message above | |
| 13:26 | pulling all the patches from B to A works fine (besides marking a few conflicts) | |
| 13:27 | err, no. darcs check works, but pull/push says the same error before askin anything | |
| 13:39 | http://bugs.darcs.net/issue1763 | |
| 13:51 | edwardk joined #darcs | |
| 13:52 | Alpounet joined #darcs | |
| 14:13 | Alpounet joined #darcs | |
| 14:21 | abuiles1 joined #darcs | |
| 14:53 | Alpounet joined #darcs | |
| 15:22 | lelit | uhm, I'm facing a strange problem: a coworker had problem pushing two patches on our common "master" repo (darcs refused to apply conflicting patches) |
| 15:22 | twb | So what's the problem? |
| 15:23 | lelit | so I copied (scp -r) the remote master repo on my local machine |
| 15:23 | edwardk | @seen kowey |
| 15:23 | lambdabot | Unknown command, try @list |
| 15:24 | lelit | applying the patches with --mark-conflicts results in a really strange conflict; I don't get any trouble if instead I do the same on a clone of my current "working repo", that has no difference (in patches) from the master |
| 15:25 | twb | edwardk: he reads the logs and only drops in when he sees something interesting -- kibo style |
| 15:25 | lelit | all the repo are consistent with "darcs check" |
| 15:25 | edwardk | twb: hah |
| 15:25 | twb | lelit: working tree differences? |
| 15:26 | edwardk | so if i chant his name three times he should appear? =) |
| 15:27 | twb | No, that makes him put on his wizard robe and hat. |
| 15:28 | lelit | twb: indeed! the master repo, even if "consistent", has a "wrong" file in the working dir! |
| 15:28 | how can it be? | |
| 15:29 | twb | lelit: you mean "darcs w -l" finds uncommitted changes? |
| 15:30 | lelit | yes |
| 15:30 | so, ignore my noise, sorry | |
| 15:31 | twb | who has direct access to the canonical repo? |
| 15:31 | lelit | me and my co-worker, but he just reminded me of an initial problem with permissions, when we opened the branch |
| 15:32 | it must be that | |
| 15:32 | twb | Very likely |
| 15:32 | Are you pushing via ssh or nfs? | |
| 15:33 | lelit | the former |
| 15:33 | twb | Suggest making a "darcs" or "project foo" user, adding both your keys to its authorized_keys file, then having the repo owned by that dummy user |
| 15:34 | lelit | nice hint, thanks |
| 15:43 | zooko joined #darcs | |
| 15:49 | mornfall | Another option is to use g+s and ALL umask 007 in .darcs/defaults. I guess. |
| 15:49 | or _darcs/prefs/defaults or whatever. | |
| 15:49 | twb | mornfall: ah, I was stumped on the umask |
| 15:49 | Otherwise I'd have mentioned that | |
| 15:58 | kpreid_ joined #darcs | |
| 16:02 | sm joined #darcs | |
| 16:10 | idnar joined #darcs | |
| 16:32 | abuiles joined #darcs | |
| 17:00 | abuiles left #darcs | |
| 18:13 | arjanb joined #darcs | |
| 18:18 | attila_lendvai joined #darcs | |
| 18:29 | sshc joined #darcs | |
| 18:40 | sshc_ joined #darcs | |
| 18:40 | kpreid_ joined #darcs | |
| 18:46 | lispy | Heffalump: was mornfall able to apply your patches? |
| 18:46 | Heffalump: I don't see any traffic on the mailing list about it | |
| 19:01 | Ingmar left #darcs | |
| 19:41 | mornfall | lispy: Yes, they should be on mainline now. |
| 19:41 | Seems that darcswatch is broken-ish. | |
| 19:42 | lispy | ah, yeah maybe ti's down |
| 19:42 | lelit joined #darcs | |
| 19:55 | sshc_ joined #darcs | |
| 20:20 | Korusef joined #darcs | |
| 20:34 | kpreid_ joined #darcs | |
| 21:48 | Korusef joined #darcs | |
| 21:58 | Korusef joined #darcs | |
| 22:00 | lispy joined #darcs | |
| 22:16 | kowey joined #darcs | |
| 22:17 | kowey | evening |
| 22:19 | edwardk: I also sometimes forget to read the logs | |
| 22:19 | edwardk | yo |
| 22:19 | its kibo! | |
| 22:19 | how goes? | |
| 22:19 | were you applying separately for gsoc this year? i forgot | |
| 22:21 | kowey | we're going to try to be part of the Haskell.org application - with a special request to Google to set aside an extra slot for us, if at all possible |
| 22:21 | edwardk | sounds good |
| 22:21 | kowey | we could also try to apply separately if you think that's best, but I tend to think we need some more time in Da Incubator |
| 22:21 | edwardk | i was getting the application ready is why i felt i should ask =) |
| 22:21 | kowey | :-) |
| 22:22 | you may find it useful to link to http://wiki.darcs.net/GoogleSummerOfCode | |
| 22:23 | edwardk | sounds good. i'll see if i can finish up everything tonight, and will definitely include a link! |
| 22:24 | * kowey | should perhaps suppress the urge to comment on ESR's blog |
| 22:24 | edwardk | hah |
| 22:24 | i had the same urge | |
| 22:24 | mostly about the monad stuff | |
| 22:25 | but i didn't want to come across as too 'needlessly academic' even though it is more 'neededly academic' at this point ;) | |
| 22:25 | kowey | part of me growing up is eventually getting it into my head (one day!) that you don't need to react everytime somebody says "darcs" |
| 22:25 | edwardk | hah |
| 22:26 | i've yet to grow up. i jump every time someone says 'tracing jit' or 'comonad' ;) | |
| 22:26 | or 'linear type' | |
| 22:26 | or one of my many dozens of other toy areas. ;) | |
| 22:26 | kowey | :-) |
| 22:28 | edwardk | i figure i won't grow up until i delete my reddit account at least ;) |
| 22:28 | i'd probably have to kill stackoverflow as well | |
| 22:30 | gotta run | |
| 22:44 | kowey | dear #darcs, may I post something like this? http://etherpad.com/yiZkcOsaFu |
| 22:49 | oops, I couldn't resist expanding on conflicts - please feel free to edit the stupid/long-winded out of that | |
| 22:50 | * Heffalump | 's new laptop has arrived! |
| 22:50 | kowey | yay! |
| 22:53 | lispy | kowey: who are you sending that to and why? |
| 22:53 | kowey | lispy: http://esr.ibiblio.org/?p=1796 |
| 22:53 | lispy | Roger? Eric? |
| 22:53 | kowey | esr is curious |
| 22:53 | it's the old "darcs isn't really formalised" thing again, a complaint that our marketing is over-hyping the "smart" part | |
| 22:54 | lispy | ah, does anyone listen to esr? |
| 22:54 | * lispy | doesn't |
| 22:54 | kowey | which is a very slight misunderstanding (but a good point nevertheless) |
| 22:54 | well, it's also to curious on-lookers | |
| 22:55 | lispy | All the linked discussions are far too lengthy for me :) |
| 23:29 | kpreid_ joined #darcs | |
| 23:31 | kowey | The Relation of Version Control to Concurrent Programming - http://www.informatik.uni-frei[…]rogramming_TR.pdf |
| 23:31 | sounds like a good one for our bibliography | |
| 23:49 | iago joined #darcs |
← Previous day | Index | Channel Index | Today | Next day → | Search | Google Search | Plain-Text | plain, newest first