Perl 6 - the future is here, just unevenly distributed

IRC log for #darcs, 2017-11-04

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

All times shown according to UTC.

Time Nick Message
02:55 ilbot3 joined #darcs
02:55 Topic for #darcs is now http://darcs.net/ | logs: http://irclog.perlgeek.de/darcs/ | darcs 2.12.5 is out http://darcs.net/Releases/2.12
10:50 Mysterious_Light joined #darcs
13:37 freemint joined #darcs
13:38 freemint Hi i got a question about how darcs behaves in the face of conflicts. Orginal file "M:100 D:20 E:0" User1 changes it to: "M:100 D:0 E:20", User2 to "M:120 D:0 E:0" how will the result look if both are merged?
14:09 Mysterious_Light a total conflict
14:12 freemint ok
14:13 freemint Can you explain why?
14:21 Mysterious_Light We have two patches conflicting because they modify the line D simultaneously. User1's patch removes D:20 E:0 and inserts D:0 E:20. User2's patch removes M:100 D:20 and inserts M:120 D:0. Both patches removes the same line, that is why they cause a conflict.
14:22 Mysterious_Light Both patches remove the same line.*
14:46 Mysterious_Ligh1 joined #darcs
15:35 Mysterious_Light joined #darcs
15:42 Mysterious_Ligh1 joined #darcs
15:45 Mysterious_Ligh2 joined #darcs
15:48 Mysterious_Light joined #darcs
16:32 freemint cool
16:49 stef204 joined #darcs
16:55 stef204 joined #darcs
19:29 gh_ joined #darcs
22:46 leg joined #darcs

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