| Time |
Nick |
Message |
| 07:17 |
|
kworstell-isl joined #evergreen |
| 07:49 |
|
collum joined #evergreen |
| 08:08 |
|
BDorsey joined #evergreen |
| 08:19 |
|
Dyrcona joined #evergreen |
| 08:34 |
|
mmorgan joined #evergreen |
| 09:31 |
|
BDorsey_ joined #evergreen |
| 09:49 |
|
BDorsey joined #evergreen |
| 10:17 |
|
sleary joined #evergreen |
| 10:36 |
|
mantis1 joined #evergreen |
| 11:16 |
|
Christineb joined #evergreen |
| 11:34 |
|
jvwoolf joined #evergreen |
| 12:03 |
|
mantis1 joined #evergreen |
| 12:09 |
|
jihpringle joined #evergreen |
| 12:20 |
|
sleary joined #evergreen |
| 12:36 |
|
collum joined #evergreen |
| 12:39 |
|
collum joined #evergreen |
| 13:12 |
|
mantis1 joined #evergreen |
| 14:26 |
* Dyrcona |
gives git worktree a try. |
| 14:35 |
Dyrcona |
This is kind of cool. |
| 14:49 |
Dyrcona |
I may just have to reorganize my code because of this feature. |
| 14:52 |
|
sleary joined #evergreen |
| 15:05 |
Dyrcona |
Yeah: Evergreen/ -> Evergreen/main ; worktrees: Evergreen/{worktree-name} works out well. |
| 15:15 |
berick |
Dyrcona: interesting, how are you using it? |
| 15:15 |
berick |
or just experimenting for now? |
| 15:15 |
Dyrcona |
I'm just experimenting, but I plan to use it to have long term WIP branches checked out, like for Quipu integration. |
| 15:17 |
berick |
what's the upshot? how is it better than just changing branches? |
| 15:18 |
Dyrcona |
I don't know, yet. I hope it will allow me to switch branches by just changing directories. |
| 15:20 |
Dyrcona |
The example from the documentation is that you're in the middle of a major refactor and your working branch is a mess. You need to make a quick bug fix, so rather than stash or commit and switch, you checkout a working tree in a parallel directory. |
| 15:21 |
Dyrcona |
it seems to me that it might also be useful for a long-lived WIP branch or a local custom branch that gets a lot of attention. |
| 15:22 |
jeff |
that touches on the main use case: eliminating the need to commit and/or stash changes. also, saves a little time if you're switching back and forth frequently and to a lesser extent avoids things like "there are a bunch of untracked generated files (possibly ignored) in this working copy because i was in the middle of something". |
| 15:24 |
jeff |
and it's nicer than having multiple working copies in their own dirs, because there's some awareness between them when you use worktree. you can do things like "git worktree list" and see a list of directories and their branch/commit, and I think you can even merge from one worktree to another without needing to push to a remote first. |
| 15:24 |
Dyrcona |
Yeah. They share the same $GIT_DIR from the main worktree. |
| 15:25 |
Dyrcona |
Plus, it's a nifty feature to talk about in my pre-conference presentation. :) |
| 15:25 |
jeff |
just like branches, nothing says that a worktree needs to be long-lived. it's recommended that you not have dozens hanging around, just create them as/if needed, and delete when no longer useful. |
| 15:25 |
jeff |
disclaimer: i haven't used them much, but was reading up on them recently -- possibly after Dyrcona mentioned the feature here. |
| 15:28 |
Dyrcona |
I don't think I've mentioned them before. I just decided to start experimenting with them to see how they work. I figured quipu-integration might be a place to start, since I want to get that fixed up better by the fall release if possible. |
| 15:29 |
* Dyrcona |
has 21 branches locally, and I recently deleted a bunch. I might have more on another laptop. |
| 15:31 |
Dyrcona |
One reason that you don't want a lot of worktrees is they take up space. My main Evergreen repository is currently 568MB and the quipu integration worktree that I just made is 167MB. |
| 15:43 |
Dyrcona |
Do that with something like Battle for Wesnoth, c. 5GB, and you'll run out of disk space in a hurry. I guess sparse-checkout might help with that, but I haven't really looked into that, yet. |
| 15:54 |
|
mantis1 left #evergreen |
| 15:58 |
|
jvwoolf left #evergreen |
| 16:12 |
Dyrcona |
Oh! Look at the time. I should skedaddle. |
| 16:12 |
Dyrcona |
I'll catch you all again tomorrow! |
| 17:03 |
|
mmorgan left #evergreen |
