Perl 6 - the future is here, just unevenly distributed

IRC log for #darcs, 2016-02-10

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

All times shown according to UTC.

Time Nick Message
00:51 pointfree joined #darcs
01:19 maerwald_ joined #darcs
01:23 mizu_no_oto joined #darcs
02:52 mizu_no_oto joined #darcs
06:00 Riastradh joined #darcs
10:15 gal_bolle joined #darcs
11:46 gh_ joined #darcs
13:47 Big_G joined #darcs
14:18 BitPuffin joined #darcs
14:35 Big_G joined #darcs
16:26 BitPuffin joined #darcs
16:49 Riastradh joined #darcs
17:02 MrTrump joined #darcs
17:02 MrTrump so what happens when I have different files, and you updated some?
17:02 MrTrump how merge it all?
17:02 MrTrump do I pull updates from u?
17:03 Riastradh joined #darcs
17:05 sm darcs pull (and push) merges the files automatically, unless you've both edited the same lines in a file, in which case you have to do some stuff
17:25 MrTrump then u pick which on want?
17:26 sm it includes both (or all) in the file, with markers, and you have to clean up the mess
17:26 MrTrump ok
17:26 sm or there are some other ways to handle it
17:28 sm re-record/rebase, basically
17:28 sm ie: adjusting the recorded patches on one side so they no longer conflict
17:54 alexei_ joined #darcs
17:58 MrTrump hmmm
18:22 prsai joined #darcs
19:37 MrTrump so darcs is ez
19:37 MrTrump I love ez
19:37 MrTrump my brain full
19:37 MrTrump needs very ez things
19:37 MrTrump darcs easier than fossil?
20:15 sm maybe, maybe not
20:16 sm if you version one file at a time, "src" should be very easy
20:16 sm http://www.catb.org/esr/src
21:22 prsai a vcs that use another vcs (git) for itself
21:23 sm he answers that in the FAQ I think
21:23 prsai ok, anyway it's curious
21:34 pointfree joined #darcs
21:39 dixie joined #darcs
21:47 C_Keen joined #darcs
21:51 dolio joined #darcs
21:54 MasseR joined #darcs
22:01 ggherdov` joined #darcs
22:18 Igloo joined #darcs
22:38 MrTrump if darcs is easier hell yeah ill us eit
22:39 MrTrump works on linux
22:39 MrTrump how about smaks?
22:52 Heffalump smaks?
23:10 Riastradh joined #darcs
23:56 MrTrump macs

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