Perl 6 - the future is here, just unevenly distributed

IRC log for #darcs, 2013-12-26

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

All times shown according to UTC.

Time Nick Message
00:21 mizu_no_oto joined #darcs
00:41 mizu_no_oto joined #darcs
00:49 whaletechno joined #darcs
00:52 mizu_no_oto joined #darcs
01:25 mizu_no_oto joined #darcs
02:10 mizu_no_oto joined #darcs
02:26 dleverto1_ joined #darcs
02:40 favonia joined #darcs
02:41 mizu_no_oto joined #darcs
02:41 dolio joined #darcs
02:44 carter joined #darcs
02:50 mizu_no_oto joined #darcs
04:51 preflex_ joined #darcs
05:56 preflex joined #darcs
09:47 yitz joined #darcs
10:13 alexei___ joined #darcs
10:30 felipe joined #darcs
10:39 raichoo joined #darcs
11:41 schlaftier joined #darcs
11:44 mizu_no_oto joined #darcs
12:41 alexei___ joined #darcs
13:10 mizu_no_oto joined #darcs
13:30 tomejaguar joined #darcs
13:31 tomejaguar I accidentally added a huge binary to my darcs repo and recorded it.  I'm now several records past that commit.  Is there any way I can remove the history of that file from the repo?  My repo is now too enormous  :(  I guess I could try to use amend-record, but since I'm so far past the original commit I don't like my chances ...
13:36 notdan_ joined #darcs
13:40 tomejaguar Do I want something like obliterate?
15:19 mizu_no_oto joined #darcs
15:35 notdan_ do you?
15:42 mizu_no_oto joined #darcs
15:46 mizu_no_oto joined #darcs
16:27 sm morning all
16:27 sm omejaguar: yeah, that can remove it
16:28 sm tomejaguar
16:34 sm it does not seem to me that the numbers at http://hub.darcs.net fron page add up
16:39 mizu_no_oto joined #darcs
16:42 notdan_ joined #darcs
16:55 mizu_no_oto joined #darcs
17:05 notdan sm: is the `hub.darcs.net' repo out of sync with the actual frontpage?
17:08 notdan anyone else having troubles logging in / reseting pw on darcs wiki?
17:15 sm notdan: they should be in sync
17:16 sm you can check by comparing "changes" at the top with the build timestamp at the bottom
17:27 notdan well
17:27 notdan for example, I dont see a "Contributing" section on the web page
17:28 notdan 'Using' section is named 'Pulling and pushing'
17:32 sm ah, hub.darcs.net front page is not the darcsden README, it's from a separate repo http://hub.darcs.net/simon/hub.darcs.net
17:32 sm still not right ?
17:33 notdan yes, I am looking at http://hub.darcs.net/simon/hub.darcs.net/browse/FRONTPAGE.md right now
17:33 sm aha yes, thanks notdan - should be fixed now
17:36 sm the site runs out of my working copy, sometimes it's convenient for quick/temporary/previewable fixes
17:41 sm and another patch pushed
17:41 sm darcsum has got unreliable for me lately.. not recording the hunks I select >:(
17:53 notdan sm: while you are at it, 'so please _help_ make this site better'; help should link to #how-can-i-help, right now it links to #how-do-i-help :)
17:53 notdan I actually wanted to point this out to you in the first place and only then I noticed the repo/page mismatch
17:54 sm notdan: thanks! I was just wondering what happened there
18:21 notdan joined #darcs
18:35 lelit joined #darcs
18:44 mizu_no_oto joined #darcs
18:48 stepkut joined #darcs
20:15 lelit joined #darcs
20:21 tomejaguar OK, so I have a patch which adds the large binary (by accident) as well as doing other needed changes.  Can I edit the history somehow so that it doesn't add the large binary?  I'd obliterate the patch, but I want to keep the needed changes that are part of it ...
20:30 sm tomejaguar: you can unrecord that patch, and all the ones depending on it, then re-record them
20:30 tomejaguar sm: OK that makes sense
20:31 tomejaguar Is there an easy way to do that?
20:31 sm or, you can learn & use the rebase command in darcs head to automate this more
20:31 tomejaguar Or do I have to go through the history and say y or n
20:33 sm there are a few shortcuts, but y/n might be simplest unless there are lot
20:33 tomejaguar OK I will try that.
20:34 tomejaguar In fact I will try obliterating them in a copy of the repo, make my changes, and then pull back in all the good patches.
20:34 sm maybe darcs unrecord -p 'big patch' will prompt to unrecord the others ? I forget
20:34 sm if the good patches depended on the one you change, you won't be able to pull them in unchanged
20:35 tomejaguar They don't depend on it because I undid the change immediately after recording it.
20:35 tomejaguar The problem is I should have unrecorded it
20:35 tomejaguar rather than leaving it in the repo as do and unod.
20:35 tomejaguar *undo
20:36 sm oh. Well just obliterate the big patch then, the later patches will not be disturbed if they don't depend on it
20:36 sm (and recover the good changes from bigpatch from backup)
20:37 tomejaguar Ah right
20:37 tomejaguar Err
20:37 sm or save them with darcs diff -p bigpatch > bigpatch.diff, edit that patch and re-apply with patch -p1 <bigpatch2.diff
20:37 tomejaguar OK so the problem is that they *do* depend on the bad patch, but not the *bad* part of the bad patch
20:38 tomejaguar Once I've removed the bad part of the bad patch, and the patch correcting the bad part, everything should apply cleanly.
20:38 tomejaguar How can I get the patchset corresponding to a patch?
20:38 sm ok, that's what I thought you said. But if you change a patch, it will invalidate all later patches depending on it
20:38 tomejaguar Hmm, OK, maybe it will not work then.
20:38 tomejaguar The context will be the same
20:38 tomejaguar but maybe that's not good enough.
20:38 sm hmm, I'm not certain
20:39 tomejaguar Anyway, can I get the diff file corresponding to a single patch?
20:39 sm darcs diff -p 'patch name' I believe
20:39 tomejaguar OK
20:41 favonia joined #darcs
20:42 alexei___ joined #darcs
20:49 tomejaguar sm: OK so it worked.  What I did was clone the repo, obliterate every patch down to the problem patch, get the problem patch with 'darcs diff -p', reapply it with the problem edited out, pull back in all the good patches (and they applied cleanly -- hooray for darcs!).
20:49 tomejaguar sm: Thanks for your help.
20:50 sm nice!
20:50 sm I didn't think that worked
20:50 tomejaguar The reapplying bit?
20:51 sm yes, depending patches reapplying cleanly if you changed the old patch without disturbing the files they depend on (if I understood you)
20:52 tomejaguar Right.  This is because AIUI darcs doesn't care about the identity of a patch, only the context it provides.
20:52 sm yay darcs
20:53 sm afk o/
20:53 tomejaguar \o
21:02 schlaftier joined #darcs
21:42 carter joined #darcs
21:57 amgarchIn9 joined #darcs
23:02 raichoo joined #darcs
23:11 notdan joined #darcs
23:11 notdan joined #darcs

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