Perl 6 - the future is here, just unevenly distributed

IRC log for #darcs, 2014-04-08

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

All times shown according to UTC.

Time Nick Message
00:01 mizu_no_oto joined #darcs
00:17 edwardk joined #darcs
00:23 favonia joined #darcs
02:04 favonia joined #darcs
02:13 mizu_no_oto joined #darcs
02:42 edwardk joined #darcs
02:45 xstill joined #darcs
03:51 vikraman joined #darcs
03:51 amgarchIn9 joined #darcs
03:56 favonia joined #darcs
04:12 monje joined #darcs
04:16 monje Hi all. If I have two repositories and changes are made on the same file, same line in both repositories, is there a way to merge both patches automatically?
04:17 monje For example: Repo1 has the file File1 with the line "This is the first line."
04:17 monje This change is pulled by Repo2...
04:18 monje Repo1 records a change to the line : "This was the first line."
04:19 monje And Repo2 records a change to the line : "This is the second line."
04:19 monje Is it possible to merge patches to get : "This was the second line." ?
04:50 thorkilnaur joined #darcs
05:27 lelit joined #darcs
05:51 schlaftier joined #darcs
07:06 Heffalump monje: that would be a conflict at present that you'd have to resolve by hand
07:14 monje Ok, thanks
07:15 raichoo joined #darcs
07:15 monje Heffalump: Much appreciated.
07:38 gal_bolle joined #darcs
09:47 ilbot3 joined #darcs
09:47 Topic for #darcs is now http://darcs.net/ | logs: http://irclog.perlgeek.de/darcs/ | darcs 2.8.4 is out http://darcs.net/Releases/2.8
09:47 xstill joined #darcs
09:54 xymox joined #darcs
10:03 heath joined #darcs
10:03 heath joined #darcs
10:17 carter joined #darcs
10:27 lelit joined #darcs
10:27 Igloo joined #darcs
10:27 MasseR joined #darcs
10:27 Heffalump joined #darcs
10:27 dolio joined #darcs
10:27 n-dolio joined #darcs
10:27 alexsuraci_ joined #darcs
10:27 stepcut joined #darcs
10:28 alexsuraci_ joined #darcs
10:28 gal_bolle joined #darcs
10:30 siel joined #darcs
10:30 siel joined #darcs
10:32 monje joined #darcs
10:32 haasn joined #darcs
10:34 c74d joined #darcs
10:39 byorgey_ joined #darcs
10:40 xymox joined #darcs
10:40 mornfall joined #darcs
10:40 alexsuraci joined #darcs
10:40 raichoo joined #darcs
12:07 c74d joined #darcs
12:17 alexsuraci_ joined #darcs
12:18 heath joined #darcs
12:18 heath joined #darcs
12:20 xstill joined #darcs
12:21 carter joined #darcs
12:23 c74d joined #darcs
12:26 edwardk joined #darcs
12:26 dolio joined #darcs
12:27 haasn joined #darcs
12:33 bishboria joined #darcs
12:43 mizu_no_oto joined #darcs
12:49 gal_bolle does anyone know when and where the term dvcs was coined?
13:36 gh_ joined #darcs
14:01 raichoo1 joined #darcs
14:05 mizu_no_oto joined #darcs
14:05 gh_ hi
14:49 colDrMcBeardman joined #darcs
14:51 lambdabot joined #darcs
15:05 schlaftier joined #darcs
15:14 stepkut joined #darcs
15:28 int-index joined #darcs
15:29 int-index How do I print a patch?
15:31 int-index In order to see what changes it makes.
15:35 gh_ int-index, darcs changes -i -p "patch name"
15:36 gh_ then you can press 'p' to view it in a pager (by default: less)
15:37 int-index Works. Thanks a lot.
15:47 alegadea joined #darcs
15:49 raichoo joined #darcs
16:15 mdiaz joined #darcs
16:42 edwardk joined #darcs
17:15 amgarchIn9 joined #darcs
17:50 edwardk joined #darcs
17:50 dleverto1_ joined #darcs
18:07 rdesfo joined #darcs
18:07 rdesfo left #darcs
18:25 amgarchIn9 joined #darcs
18:43 amgarchIn9 joined #darcs
19:05 mizu_no_oto joined #darcs
19:56 edwardk joined #darcs
20:43 gh_ joined #darcs
21:02 mizu_no_oto joined #darcs
21:45 byorgey_ joined #darcs
21:53 colDrMcBeardman joined #darcs
22:01 schlaftier joined #darcs
22:43 stepkut joined #darcs

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