Camelia, the Perl 6 bug

IRC log for #darcs, 2011-04-25

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

All times shown according to UTC.

Time Nick Message
00:50 iago left #darcs
01:10 owst left #darcs
02:31 sm joined #darcs
02:47 intripoon joined #darcs
02:48 jeffz joined #darcs
02:51 intripoon_ left #darcs
04:09 sm left #darcs
06:52 shenshei joined #darcs
06:55 copumpkin left #darcs
06:56 copumpkin joined #darcs
07:18 lelit joined #darcs
07:34 _ilbot joined #darcs
07:34 Topic for #darcs is now can't talk? see -> | http://wiki.darcs.net/IRC | http://darcs.net/ | latest is 2.5.2
08:23 jeltsch joined #darcs
09:20 raichoo joined #darcs
09:23 balor joined #darcs
09:39 balor left #darcs
09:55 lelit left #darcs
09:56 lelit joined #darcs
10:10 jderque joined #darcs
10:18 dcolish left #darcs
11:04 exlevan left #darcs
11:04 exlevan joined #darcs
11:42 t[]m joined #darcs
12:02 shenshei left #darcs
12:07 shenshei joined #darcs
12:26 t[]m left #darcs
12:56 jderque left #darcs
13:10 intripoon_ joined #darcs
13:13 intripoon left #darcs
13:20 intripoon joined #darcs
13:23 intripoon_ left #darcs
13:46 iago joined #darcs
14:08 copumpkin left #darcs
14:14 sm joined #darcs
14:35 copumpkin joined #darcs
14:44 dcolish joined #darcs
14:46 jeffz left #darcs
14:47 secorp left #darcs
15:12 sm morning all
15:28 pumpkin joined #darcs
15:29 secorp joined #darcs
15:31 copumpkin left #darcs
15:31 pumpkin is now known as copumpkin
15:39 bsrk2 joined #darcs
16:01 lispy left #darcs
16:03 lelit left #darcs
16:29 bsrk2 left #darcs
16:32 secorp left #darcs
16:40 sm_ joined #darcs
16:42 sm left #darcs
16:42 sm_ is now known as sm
16:44 lispy joined #darcs
16:51 raichoo left #darcs
17:21 Riastradh joined #darcs
17:23 jderque joined #darcs
17:24 sm I'd like to understand why I get conflicts in my syncing setup
17:26 sm I sync the working copies (not _darcs) of a repo between home machine and netbook frequently with unison. I record patches only on one side (the home machine). Every so often I pull the new patches to the netbook. Since the working copies are identical, and no conflicting patches have been recorded on the netbook, I expect no conflicts, but sometimes I get them and I'm not sure why
17:28 sm is it because there's successive patches to a file.. and pulling just one does conflict with the working copy, whereas if I pulled them all it would work ? pull -a still conflicts though
17:32 Heffalump have you actually recorded the entire state of working, though?
17:34 secorp joined #darcs
17:34 sm Heffalump: on the home machine, all is recorded except one small new change. I'm looking at one specific file now - hledger/NEWS.md - release notes, quite conflictful. That's fully recorded on home, and I'm trying to pull three update patches to the netbook. The working copies' NEWS.md are identical
17:34 Igloo You need to revert all local changes before pulling
17:35 Igloo Otherwise the unrecorded local changes will conflict with the patch
17:36 sm Igloo: why is that ? I thought that if the working copy is the same as the end result after pulling the patch, darcs would let me pull
17:36 Igloo Oh, if it's only 1 patch then it's possible it would work due to the duplicate patches hack in darcs2, but I don't know the details about how that works
17:38 sm in this case I'm trying to pull three patches, which combined will result in the same working copy
17:38 sm it won't let me pull just the first or all three
17:39 * sm looks for a file with a single pending patch, to compare
17:42 sm yes, that pulls. So maybe this is the issue. Pulling when a file's working copy already matches the post-pull state works for one patch to that file, but not more
17:42 Heffalump I was assuming you were using darcs2. But Igloo is probably right anyway about multiple patches.
17:42 sm this is darcs-2, certainly
17:44 sm ok, thanks guys. Understanding this I can see how to refine my workflow
17:45 sm after editing working copy on both sides, I should unison, then record on one side, revert all on the other, and pull
17:48 Heffalump yeah
17:48 Heffalump it'd be nice if there was a better workflow for this
17:49 sm it gets a little tricky syncing two machines' repos and working copies like this, but it seems to be worth it for me for mobility
17:49 sm trying to make it routine and robust
17:52 sm I wonder how hard it would be for darcs to check for conflicts with working copy after pulling all patches, instead of after each one
17:52 Heffalump hard
17:53 Heffalump it's not actively checking for conflicts, it's just merging. And in darcs merging is, by design, one patch at a time.
17:53 sm I see
17:54 sm does merging have to look at the working copy at all ?
17:54 sm I sort of want to say: pull your patches, don't look at the working copy right now
18:00 Heffalump darcs -lam 'temp' ; darcs pull -a ; darcs unrec -p 'temp' ?
18:00 Heffalump but I think you'd still have conflict markers actually
18:00 Heffalump for the same reasons
18:03 Igloo There's no reason you have to update the working directory, although you might want to update timestamps at least
18:03 Igloo I don't know if darcs looks for == or > the timestamp it expects
18:53 Heffalump actually, maybe there is a flag
19:09 * Heffalump congratulates mornfall and owst on getting GSoC projects accepted
19:10 owst joined #darcs
19:12 sm yay
19:12 owst :)
19:12 owst Just got back to a very pleasent email!
19:19 Igloo congrats
19:19 copumpkin Heffalump: where's the list?
19:19 owst http://www.google-melange.com/gs​oc/projects/list/google/gsoc2011 Shows all accepted projects.
19:20 copumpkin thanks :)
19:20 owst (You can filter to haskell.org)
19:20 copumpkin I see :)
19:20 copumpkin haskell got 7!
19:20 copumpkin is that more or less than last year?
19:21 copumpkin *fewer, I guess
19:24 jonkri joined #darcs
19:36 Heffalump same I think
19:42 dixie less is sometimes more :-)
19:56 jonkri left #darcs
20:04 owst left #darcs
20:13 intripoon_ joined #darcs
20:16 intripoon left #darcs
20:25 lispy left #darcs
20:25 lispy joined #darcs
20:30 jderque left #darcs
20:48 Igloo left #darcs
20:55 Igloo joined #darcs
21:18 JaffaCake1 joined #darcs
21:20 JaffaCake left #darcs
21:28 shenshei left #darcs
21:28 shenshei joined #darcs
21:40 intripoon joined #darcs
21:43 intripoon_ left #darcs
22:12 jeltsch left #darcs
22:36 shenshei left #darcs
22:39 jeffz joined #darcs
23:16 exlevan left #darcs
23:17 exlevan joined #darcs
23:18 t[]m joined #darcs
23:58 t[]m left #darcs

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