Perl 6 - the future is here, just unevenly distributed

IRC log for #darcs, 2016-05-10

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

All times shown according to UTC.

Time Nick Message
00:48 Big_G joined #darcs
01:52 mizu_no_oto joined #darcs
04:11 theone joined #darcs
07:31 inhortte joined #darcs
07:35 Weltraumschaf joined #darcs
10:06 pbgc joined #darcs
11:59 mizu_no_oto joined #darcs
12:42 Weltraumschaf joined #darcs
13:04 pbgc joined #darcs
14:05 Big_G joined #darcs
14:06 BitPuffin joined #darcs
15:13 Weltraumschaf_ joined #darcs
15:15 inhortte joined #darcs
16:22 roconnor joined #darcs
16:22 roconnor I have a unrecorded changes in my working directory
16:22 roconnor I think I rather record these changes in a new, separate branch
16:23 roconnor what's the idiom for doing this?
16:24 dolio What's a branch?
16:24 roconnor a new directory
16:25 roconnor I can create a new directory, darcs get from the master directory
16:25 dolio Well, I can think of two ways.
16:25 dolio Rename directory, get from the renamed directory, commit in the renamed directory.
16:26 dolio Or, commit, clone to the new 'branch', then obliterate your commit in the original place.
16:26 roconnor okay, those were my two ideas too
16:26 dolio The only difference will be untracked stuff, I think.
16:52 amgarchIn9 joined #darcs
17:11 amgarchIn9 joined #darcs
17:51 Riastradh joined #darcs
18:13 sm darcs obliterate -O wip.patch will save the unrecorded changes for later "darcs apply", in case you don't want a branch right this second
18:15 dolio Interesting.
18:15 dolio I wonder if there could be a similar revert -O.
18:15 sm darcs get . [../]tmpbranch --lazy could make the branch
18:16 sm oh I meant just "darcs obliterate -O"
18:16 sm or -aO if you're confident
18:17 sm or.. hmm I just woke up, am I talking nonsense ?
18:18 sm yes, dolio I was imagining what you said. I guess it's "darcs record -am WIP && darcs obliterate -O", or "darcs diff >WIP.diff && darcs revert -a"
18:19 dolio Does diff output something you can apply later?
18:20 sm with patch, yes
18:20 dolio Well, sure. :)
18:20 sm it's not a darcs patch
18:20 sm but, yes
18:20 dolio It's not the same as the -O format, was my question, I guess.
18:20 sm that's right
18:23 sm still questing for a command line to emulate git checkout -b BRANCH...
18:25 sm darcs get --lazy . ../REPO.OLD && mv ../REPO{,.NEW} && mv ../REPO{.OLD,}
18:27 sm darcs get --lazy . ../REPO-OLD && mv ../REPO{,-BRANCH} && mv ../REPO{-OLD,}
18:27 sm but that leaves the uncommitted files in the new branch
18:29 sm cp -pr ../REPO{,-BRANCH} && darcs revert -a && cd ../REPO-BRANCH  # keeps uncommitted files in both branches
18:31 dolio You could symlink instead of moving things around. And the uncommitted thing could be handled by recording and obliterating to a chosen name.
18:31 dolio That's -o instead of -O I guess?
18:31 sm yeah
18:32 dolio Just need a naming convention for the temp file that isn't going to stomp on anything.
18:32 sm darcs get --lazy . ../REPO-BRANCH && (darcs diff | (cd ../REPO-BRANCH; patch -p1)) && darcs revert -a && cd ../REPO-BRANCH  # leave uncommitted things in old branch only
18:33 dolio Can't use diff.
18:33 dolio It doesn't --look-for-adds.
18:33 sm I was just using it to move the unrecorded stuff there
18:34 dolio Right, but new files are unrecorded stuff.
18:35 sm so I suppose keeping unrecorded stuff with the new branch is more like git
18:36 sm darcs get --lazy . _darcs/branches/`cat _darcs/current-branch` && echo BRANCH > _darcs/current-branch  # closer ?
18:38 sm save the current repo in a safe place under _darcs, and update the current branch name
18:39 dolio Maybe. I find git's branching very weird.
18:41 sm I think that last one is almost usable, except it will save a new copy if the current branch has been saved already.. I need a get-or-pull operation
18:42 dolio You probably want --no-working-dir on those _darcs saves.
18:43 dolio It'd be interesting if you could separate the working dir from the repository in darcs.
18:43 dolio That might be all you really need.
18:43 dolio Then your branches could be a bunch of no-working-dir repositories.
18:43 sm good idea
18:44 sm Heffalump: poor man's in-repo branching ^^ ?
18:44 dolio I guess you'd also need a way to change your working directory based on the difference in patches between two no-working-dir repositories.
18:46 roconnor joined #darcs
18:51 roconnor_ joined #darcs
19:44 roconnor_ joined #darcs
19:49 roconnor_ joined #darcs
19:50 Heffalump sm: umm, dunno :-) The hard part of in-repo branching is the UI, I think
19:51 inhortte joined #darcs
20:15 sm hmm we need a test subject
20:15 * sm looks around

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