Camelia, the Perl 6 bug

IRC log for #darcs, 2013-03-15

| Channels | #darcs index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:25 schlaftier joined #darcs
00:29 mizu_no_oto joined #darcs
00:59 MasseR joined #darcs
01:30 gh_ joined #darcs
02:12 intripoon_ joined #darcs
03:18 mizu_no_oto joined #darcs
03:40 mizu_no_oto joined #darcs
04:46 preflex_ joined #darcs
06:10 Kindaro joined #darcs
06:32 lelit joined #darcs
06:34 whaletechno joined #darcs
08:27 raichoo joined #darcs
08:41 amgarchIn9 joined #darcs
09:44 schlaftier joined #darcs
10:55 zbeasnyy joined #darcs
10:56 mornfall joined #darcs
11:03 iago joined #darcs
11:06 donri joined #darcs
11:33 iago when there is a conflict an "invisible" conflictor patch is stored, isn't it?
11:35 iago I did rebase suspend, darcs amend, rebase unsuspend, and I got a conflict. Then I decided that I don't want to record a new patch to resolve that conflict so I did revert and suspend so that I can amend the patch that I know is causing the conflict
11:35 iago but now there is no conflict
11:36 iago darcs "decided"
11:36 iago any help is appreciated :-)
11:49 iago uhm, it would be nice if Darcs warns me before modifying a patch
11:50 iago it basically adjusted one of the patches I was unsuspending to match the context (which changed after I amended)
11:51 iago that action makes no sense IMO
11:51 iago doing that darcs basically corrupted my patch
11:59 mornfall joined #darcs
12:09 owst joined #darcs
12:20 mizu_no_oto joined #darcs
12:30 schlaftier joined #darcs
13:08 whaletechno joined #darcs
13:09 gh_ joined #darcs
14:10 gh_ joined #darcs
14:25 mizu_no_oto joined #darcs
16:12 gh_ joined #darcs
17:59 amgarchIn9 joined #darcs
18:50 gh_ joined #darcs
19:17 lelit` joined #darcs
19:52 sm oh my god, the horror of this conflicted file.. I wished I'd saved it before starting in
20:16 Heffalump :-(
20:18 Igloo Doesn't darcs save a copy first nowadays?
20:30 sm maybe ? I had unrecorded changes, enabled pull conflicts and pulled, expecting the usual minor conflicts
20:31 sm and got a series of ANCIENT***RECENT1***RECENT2 conflicts, and I could swear some with 4 or 5 RECENT hunks, unless I imagined that
20:33 sm and somehow the hunks were "staggered", so the comparable code hunks weren't nicely grouped in the same conflict
20:33 schlaftier joined #darcs
20:33 sm I should have surveyed the whole thing up before I started editing
20:33 sm up front
20:37 amgarchIn9 backup? That is why I always do darcs diff > pending.diff before pulling
20:37 amgarchIn9 darcs could have taken that task over, actually
20:42 Igloo I thought you got file.darcs-backup-0 files
20:44 Weltraumschaf joined #darcs
20:47 Heffalump .~0~ now I think
20:47 Heffalump for standards compatibility
20:47 sm aha.. yes I see CsvReader.hs.~0~. Thought it was emacs
20:48 sm good job darcs (though usually those backups drive me nuts)
21:00 jch joined #darcs
21:11 Weltraumschaf hi
21:23 jch left #darcs
21:28 carter joined #darcs
21:31 Heffalump hi
22:13 mizu_no_oto joined #darcs
22:57 saep joined #darcs
23:08 amgarchIn9 joined #darcs
23:16 mizu_no_oto joined #darcs

| Channels | #darcs index | Today | | Search | Google Search | Plain-Text | summary