Camelia, the Perl 6 bug

IRC log for #darcs, 2012-12-19

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

All times shown according to UTC.

Time Nick Message
01:59 mizu_no_oto joined #darcs
02:48 intripoon joined #darcs
03:00 ivanm joined #darcs
03:00 ivanm Will we be seeing a 7.6.1 compatible version of darcs any time soon?
03:34 jyyou joined #darcs
04:30 favonia joined #darcs
06:30 Heffalump ivanm: yes, it's ready to release
06:30 ivanm excellent, excellent *rubs hands*
06:31 Heffalump just checking on wheher another bugfix should go in, will probably get it out in a day or two
06:31 ivanm because I've been putting off trying to patch 2.8 :p
06:31 Heffalump if you downlod the 2.8 branch or head those should both work with 7.6
06:31 ivanm oh? unless the hub.darcs copies aren't up-to-date, they didn't allow building with 7.6 when I looked at them the other day
06:35 Heffalump I only finished this a couple of days ago
06:35 ivanm ahhh, fair enough
06:41 Heather joined #darcs
06:41 Heather hi
06:41 Heather is there easy way to convert git repo to darcs
06:47 Heather left #darcs
07:36 lelit joined #darcs
07:50 jyyou joined #darcs
08:08 raichoo joined #darcs
11:06 bsrk joined #darcs
12:27 donri joined #darcs
12:30 mizu_no_oto joined #darcs
13:37 stepcut joined #darcs
14:01 ivanm joined #darcs
14:18 mizu_no_oto joined #darcs
14:22 ivanm joined #darcs
14:37 markstos joined #darcs
14:42 markstos left #darcs
14:42 markstos joined #darcs
15:21 mizu_no_oto joined #darcs
15:46 ivanm joined #darcs
16:07 mizu_no_oto joined #darcs
16:18 ivanm joined #darcs
16:23 Modius joined #darcs
16:23 Modius Is there a way to have Darcs interpret 3 lines that happen to be next to eachother as separate hunks?
16:23 markstos Modius: during darcs record for that hunk, press "e" to edit it.
16:24 markstos You'lll find a  UI to split the hunk into two parts.
16:24 Modius Right; but it still groups the 3 lines
16:24 Modius By splitting the 2 hunks into 4?
16:24 Modius I mean, the 2 sections
16:24 markstos Yep.
16:24 Modius The UI that comes up shows the "before" nad "after"
16:24 Modius I can make 2 befores and 2 afters out of that?
16:25 markstos I think you put just the first hunk in the "after".
16:25 markstos Don't worry, darcs never writes back changes to your files.
16:25 markstos When you are done, it will then appear that you have possible changes to record, the "after" and the remaining.
16:26 Modius This may be complicated too by the 3 patches that made the 3 lines getting made dependencies of eachother
16:26 Modius May be a good learning op to clean up the individual patches a bit
16:26 markstos It's a cool feature, for just this case, but takes a little getting used to.
16:26 markstos I use the feature regularly.
16:26 markstos Especially for skipping over debug output while I'm recording, which may be embedded with meaningful change.s
16:27 Modius I think I have 2 problems, I think the patches that made the 3 lines simply aren't clean patches
16:27 markstos There are limits to how darcs can help you. :)
16:28 Modius Technically, I made patches that recorded what I did historically, which wasn't 3 divisible steps as it should be.  This is far from critical; but I'll use it as a learning opportunity.
16:32 Modius What's the best way to modify a patch that is depended upon by others, and split it into 2 patches (1 dependent on the other)?
16:33 markstos Modius:  all the patches are private to your repo at this point?
16:33 Modius YEah, that's not an issue
16:34 markstos The latest dev release of darcs has a "rebase" command for just this issue.  Are you interested to try that route?
16:35 Modius Haha - what's the best doc?  I got it to compile on my toher machine, should be able to on this one
16:35 markstos You would need to download and possibly compile 2.9.6 to try it.
16:35 markstos You can search for "rebase" on wiki.darcs.net, but here's the short tutorial:
16:36 markstos Let's say that A and B depend on C, and you want to split C into D anda E.
16:36 markstos darcs rebase suspend -p C
16:36 markstos This will start an interactive UI, which will automatically select A and B, because they depend on C.
16:37 markstos Say "yes" to suspending A and B but NOT C.
16:37 markstos Now that A and B are out of the way, you can "unrecord" C, and re-record it as D and E.
16:37 markstos Finally "darcs rebase reify" will (interactively) allow you to bring  back A and B into the repo.
16:38 markstos If darcs needs to do any "fixup" work, it will appear as separate patches.
16:38 markstos (There is also "darcs rebase unsuspend", but it silently injects  fixup changes into your patches, which I've found I dislike.
16:39 markstos To be clear, A and B will likely be "amended" by the process... and it's good idea to make a backup copy of the repo before starting a rebase. :)
16:39 Modius Aye, thanks for all this - it'll be an ideal place for me to safely test it with a simple change
16:39 markstos I need to return to $work now but good luck with that....
16:39 Modius Darcs is. . . .interesting.
16:40 markstos What language is your project in?
16:40 Modius Actually I'm using Darcs here for my Emacs config and dependencies.
16:40 Modius Breaking the config up (huge)
16:41 markstos That's interesting.
16:41 Modius I also use it for my Common Lisp codeball; but that's not at issue here.
16:41 Modius It's the **** for Emacs config to pull it across a ton of machines.
16:41 markstos I see.
16:41 markstos Back to $work for me. Good luck!
16:41 Modius And the changes have no sequential "latest is best" like a software project, and chance of a change fu**ing up on another platform is high.
16:41 Modius Bye
16:41 Modius thanks
16:42 markstos left #darcs
16:51 ivanm joined #darcs
17:57 raichoo joined #darcs
18:01 amgarchIn9 joined #darcs
18:34 mizu_no_oto joined #darcs
19:25 gpiero joined #darcs
19:33 ivanm joined #darcs
20:51 raichoo joined #darcs
21:57 mizu_no_oto joined #darcs
23:06 sm__ joined #darcs
23:15 sm__ joined #darcs
23:52 gpiero left #darcs

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