Perl 6 - the future is here, just unevenly distributed

IRC log for #darcs, 2016-03-20

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

All times shown according to UTC.

Time Nick Message
00:01 fr33domlover I tried darcs amend, won't work
00:01 fr33domlover If I refuse to record add/remove then it doesn't even offer to record the moves
00:24 Big_G joined #darcs
00:30 owst joined #darcs
02:46 alexei_ joined #darcs
07:51 castlelo1 joined #darcs
08:08 teratorn_ joined #darcs
08:11 teratorn joined #darcs
08:12 castlelo1 joined #darcs
08:32 castlelo1 joined #darcs
08:49 castlelo1 joined #darcs
09:27 castlelo1 joined #darcs
09:50 alexei_ joined #darcs
09:58 castlelo1 joined #darcs
09:58 inhortte joined #darcs
11:03 owst joined #darcs
11:27 Heffalump fr33domlover: hmm, I think the A/R are indeed a problem. 'darcs revert' would get rid of them but might also destroy the actual changes.
13:46 Big_G joined #darcs
13:50 alexei_ joined #darcs
14:07 mizu_no_oto joined #darcs
15:04 castlelo1 joined #darcs
15:19 mizu_no_oto joined #darcs
15:45 Riastradh joined #darcs
16:38 owst joined #darcs
16:42 fr33domlover Heffalump, I'll backup the files => darcs revert => move backup back to the repo :P
16:53 fr33domlover Heffalump, I'm still getting weird things: Now it behaves like both old and new paths are in the repo
16:53 fr33domlover Can I /delete/ the patch entirely and make a fresh one?
17:08 fr33domlover Heffalump, rebase success but it says I have conflicts
17:17 fr33domlover and they ruin the history again which is what i'm trying to fix :P
17:38 fr33domlover ok, i now have a new fixed "Move to Network" patch in the repo, but I'm not sure how to unsuspend without ruining it / having conflicts which ruin it
17:39 fr33domlover What if I somehow export the suspended patches in .patch files and then apply them? hmm
17:51 dolio joined #darcs
17:56 alexei_ joined #darcs
18:05 teratorn joined #darcs
18:11 teratorn joined #darcs
18:18 owst joined #darcs
18:40 Heffalump fr33domlover: rebase is intended to avoid that being necessary, but the UI may not be ideal :-)
18:43 Heffalump if you're having trouble I could have a go at doing it, if you've got all your work in one repo I can rebase at once
18:46 teratorn joined #darcs
19:13 amgarchIn9 joined #darcs
19:22 teratorn rebase is just a “merge forward” operation right?
19:23 teratorn well, or backwards
19:30 amgarchIn9 joined #darcs
19:40 inhortte joined #darcs
19:41 mizu_no_oto joined #darcs
19:45 teratorn Heffalump: ?
19:46 Heffalump teratorn: not exactly - it edits patches. I guess it's like merging forward.
19:46 Heffalump Things that in git would be a rebase are often just a commute or merge in darcs, but darcs rebase is for cases where you really want to edit them for whatever reason.
19:47 teratorn edits your outstanding (unpushed.. or just not-existing on the remote?) patches so that they become patches on top of an updated set of patches from remote?
19:47 teratorn I see right because patch commuting means that the same patches applied in different orders result in the same tree?
19:47 teratorn when it works, that is?
19:55 Heffalump right
20:03 teratorn are there any other DVCS that implement patch commuting just out of curiosity?
20:13 Heffalump Pijul and camp, that's all I know of
21:30 inhortte joined #darcs
22:13 fr33domlover Heffalump, it will be great if you give it a try, and then plz tell me how you did it (i want to learn)
22:17 castlelore joined #darcs
22:19 castlelore joined #darcs
23:03 mizu_no_oto joined #darcs
23:04 Big_G joined #darcs
23:12 ronny_ joined #darcs

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