Perl 6 - the future is here, just unevenly distributed

IRC log for #darcs, 2015-06-14

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

All times shown according to UTC.

Time Nick Message
00:49 sm roconnor: if you have two branches, you probably want to merge them at least temporarily before converting
01:30 f-a joined #darcs
02:25 roconnor sm: what does merging two darcs branches even mean?
02:56 dolio Pulling all the patches into a single repository?
02:56 dolio And resolving the conflicts, I guess.
02:57 dolio You could pull them all into a single one, convert, then pull only the patches from each branch.
02:57 dolio Maybe.
03:04 roconnor hmm
03:17 dolio I assume the problem when converting two repos separately is that it wouldn't recognize the common patches as actually common.
03:17 dolio But I don't really know.
03:29 mizu_no_oto joined #darcs
03:36 amgarchIn9 joined #darcs
06:49 f-a joined #darcs
07:20 amgarchIn9 joined #darcs
07:30 notdan joined #darcs
08:15 amgarchIn9 joined #darcs
08:49 amgarchIn9 joined #darcs
08:57 c74d joined #darcs
09:08 f-a joined #darcs
10:09 amgarchIn9 joined #darcs
12:16 amgarchIn9 joined #darcs
13:47 Heffalump dolio: that's right. Actually no need to resolve the conflicts, just convert and then re-extract the two separate repos again
14:22 amgarchIn9 joined #darcs
18:21 peb` joined #darcs
18:51 f-a joined #darcs
19:00 f-a joined #darcs
20:06 amgarchIn9 joined #darcs
20:29 f-a I made some changes that I want to discard (unrevert), but I want to save them somehow too. What's the correct action? record / unrecord / revert?
20:29 Heffalump record, obliterate -O
20:29 Heffalump that'll save them in a dpatch you can reapply later
20:30 Heffalump (as long as you don't remove/amend any other patches in your repo, but in the worst case you will have the changes textually and can reapply them by hand)
20:34 f-a thanks Heffalump , worked like a charm
20:44 Riastradh joined #darcs
21:05 aristid joined #darcs
22:31 mizu_no_oto joined #darcs
22:38 Igloo joined #darcs
22:51 mizu_no_oto joined #darcs

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