Camelia, the Perl 6 bug

IRC log for #darcs, 2013-07-04

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

All times shown according to UTC.

Time Nick Message
01:47 intripoon_ joined #darcs
01:49 whaletechho joined #darcs
02:21 mizu_no_oto joined #darcs
02:22 dolio joined #darcs
03:16 whaletechno joined #darcs
03:46 idnar joined #darcs
03:57 idnaria joined #darcs
04:06 mizu_no_oto joined #darcs
04:24 idnar joined #darcs
04:26 idnar joined #darcs
04:27 idnar joined #darcs
04:36 idnar joined #darcs
04:43 Kindaro joined #darcs
05:21 mizu_no_oto joined #darcs
06:49 lelit joined #darcs
07:05 raichoo joined #darcs
07:15 gh_ joined #darcs
07:36 alexei_ joined #darcs
08:47 sm joined #darcs
09:18 owst joined #darcs
09:25 jgross__ joined #darcs
09:28 jgross___ joined #darcs
09:28 marmoute_ joined #darcs
09:52 gh_ joined #darcs
10:00 gh_ hi
10:18 gh_ sm, are there rss/atom feeds for projects on hub.darcs.net?
10:18 whaletechno joined #darcs
10:55 donri joined #darcs
11:40 nomeata joined #darcs
13:22 konundra joined #darcs
13:27 uniquenick joined #darcs
13:32 gh_ "mark-conflicts can't mark complicated conflicts. In that case you'll have to use darcs diff and other commands to understand what the conflict is all about. If for example two conflicting patches create the same file, mark-conflicts will pick just one of them, and no delimiters are inserted. So watch out if darcs tells you about a conflict. "   this does not happen, at least with darcs-2 patch semantics
13:33 gh_ it does insert delimiters
13:33 gh_ with both new contents
13:35 gh_ ok, I just tried it with darcs-1 patch semantics, and the description is correct in this case
14:27 gh_ so I sent (and screened) this http://bugs.darcs.net/patch1077 which solves http://bugs.darcs.net/issue1828
14:34 gh_ this is a short term solution, but in the future it would be nice to have more information about conflicts, sort of like the output of the function Darcs.Patch.Summary.plainSummaryPrims but more adapted to conflicts presenation
14:34 gh_ *presentation
14:34 gh_ this would be nice for add, move, delete conflicts
14:35 gh_ but it would be nice to address this issue of UI presentation for all relevant commands at once, not just mark-conflicts (pull, apply, etc.)
15:03 mizu_no_oto joined #darcs
15:08 sm hi gh_, the atom feeds are at .../REPO/changes/atom
15:12 gh_ sm, cool thanks
15:16 mizu_no_oto joined #darcs
15:18 gh_ what is the fastest way of checking if a repository has conflicts? cf http://bugs.darcs.net/issue2010
15:18 owst `darcs cha | grep conflictor` ? :-p
15:18 owst well that would fail without -v :-)
15:19 owst I wonder how patchsetConflictResolutions is implemented
15:20 gh_ owst, I mean at the source code level
15:20 owst Oh I see
15:20 owst I guess it's a pain since you need to know if a conflictor has been resolved
15:20 gh_ owst, I'm referring to the last message of http://bugs.darcs.net/issue2010
15:20 owst Yeah, just saw that
15:20 owst :-)
15:21 * owst wonders if the patch index could help here
15:21 owst (by tracking the currently conflicting files)
15:24 gh_ would this require a change of format in patch index?
15:24 owst Yeah
15:24 gh_ what would be the best patch-index-agnostic solution?
15:24 owst Umm.
15:24 owst Can you tag a repo with unresolved conflicts?
15:24 owst Otherwise I guess you only need to look forwards from the last tag
15:25 owst (maybe patchsetConflictResolutions already does that)
15:36 Kindaro joined #darcs
15:37 konundra joined #darcs
15:40 mizu_no_oto joined #darcs
15:52 mizu_no_oto joined #darcs
16:22 raichoo joined #darcs
16:34 mizu_no_oto joined #darcs
17:06 zooko joined #darcs
17:23 alexei_ joined #darcs
17:45 mizu_no_oto joined #darcs
17:59 alexei_ joined #darcs
18:03 mizu_no_oto joined #darcs
18:38 alexei_ joined #darcs
18:55 Kindaro joined #darcs
19:17 donri joined #darcs
19:38 favonia_ joined #darcs
19:41 alexsuraci` joined #darcs
19:44 marmoute joined #darcs
19:52 mizu_no_oto joined #darcs
19:52 Kindaro joined #darcs
19:56 byorgey_ joined #darcs
20:07 amgarchIn9 joined #darcs
20:28 mizu_no_oto joined #darcs
21:00 gh_ joined #darcs
21:01 preflex joined #darcs
21:11 carter_ joined #darcs
23:03 mtp joined #darcs
23:03 mtp joined #darcs

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