oursin: George Beresford photograph of the young Rebecca West in a large hat, overwritten 'Neither a doormat nor a prostitute' (Neither a doormat nor a prostitute)
[personal profile] oursin

Okay, my dearios, I am sure all dear rdrs are with me that tradwives are not trad, they are deploying an aesthetic loosely based on vague memories of the 1950s - and meedja representations at that - and some very creepy cultish behaviour - they are not returning to some lovely Nachral State -

And that as I bang on about a lot, women have been engaged in all kinds of economic activity THROUGHOUT THE WHOLE OF HISTORY since economic activity became A Thing.

Why tradwives aren’t trad: The housewife is a Victorian invention. History shows us women’s true economic power

I have a spot of nitpickery to apply - it rather skips over and elides the move from the household economy into factories e.g., leading to 'separate spheres' with wife stuck at home (and even that was a very blurry distinction, I mutter); and also the amount of exploitative homeworking undertaken by women of the lower classes (often to the detriment of any kind of 'good housekeeping').(Not saying middle-class women didn't also find ways of making a spot of moolah to eke out household budget.)

And of course a lot of tradwives are actually performing as economically productive influencers: TikTok tradwives: femininity, reproduction, and social media - in a tradition of women who made a very nice living out of telling other women how to be domestic goddesses, ahem ahem.

yhlee: Alto clef and whole note (middle C). (Default)
[personal profile] yhlee


Ashford Traveller (single treadle although you can see that, Scotch tension). Spinning mulberry (bombyx) silk from combed top.

(no subject)

Sep. 12th, 2025 09:42 am
oursin: Brush the Wandering Hedgehog by the fire (Default)
[personal profile] oursin
Happy birthday, [personal profile] davidgillon and [personal profile] surexit!

Mingled yarn of life

Sep. 11th, 2025 08:20 pm
oursin: Brush the Wandering Hedgehog by the fire (Default)
[personal profile] oursin

Text today from my general practice to book Covid + flu jabs - actually in a months time, but I now have a slot booked.

***

Having been moaning on over at bluesky about scholars these days not acknowledging existing (older) historiography, Dept of Preening Gratification was coming across footnote cite to 30 year-old co-authored work as 'A key starting point' for certain 'productive considerations' within the field.

***

On the other prickly paw, I am still failing to get up to a proper swing at the essay review - keep niggling and picking at the bit I've already done.

Partly due to Interruptions happening.

Also partly due to not sleeping terribly well this week for some reason.

***

Discovered today that I had somehow acquired an ebook of recent work on subject I have had far too much to do with and had totally forgotten about it. Looking up an area of Mi Pertikler Xpertize, o dear, a number of niggling Errours.

***

Attended a webinar the other day where someone claimed that a certain class of records did not survive in respect of the lower orders on account They Could Not Write, and I was more, no, it's an issue of preservation, what about those postcards that I spoke about on a TV programme once - but that is such an annoying story, what DID happen to the cards after the filming? - apart from the flaunting of Being Meedja Personality, so decided not to raise my virtual hand.

wychwood: Atlantis seen under the curve of Earth's stargate (SGA - city exploring)
[personal profile] wychwood
Interminable September progresses. The next two weeks are going to be the especially busy parts, but I made fifteen portions of pasta (waiting for me in the freezer), started refusing any invitations to do anything whatsoever in September that isn't already in my calendar ("not even for your poor sick mother??" she said, and I said NO but how about the first weekend in October), and am as up together as I can manage (not terribly).

I'm also in full hibernation mode and doing nothing in my actual free time except read intensely and greedily (already finished one of the poll-winners). I haven't bought any more books since last week, though, so that's something. I'm going to bribe myself with volume 2 of Wayne Family Adventures when I survive the month, though.

spinning WIP

Sep. 11th, 2025 05:21 am
yhlee: Alto clef and whole note (middle C). (Default)
[personal profile] yhlee
Or: if your goal is threadweight/cobweb, why silk fiber is not quite as profligate an expense as you might think:



The white is mulberry bombyx silk; the tawny stuff was my briefly foraying into eri silk. This is for personal use/enjoyment (needle lace) so it's fine that I'm wandering off like this. This is several hours of admittedly inefficient spinning, since I take frequent breaks so there's a very start-stop nature to it, but because the spin is so fine, this bobbin is...not very full.



This is what I have REMAINING in 2 oz. of mulberry silk combed top (about $25 USD). It exploded out of the package (typical) and also, it barely looks like I've even used any of it. As it stands, I suspect I'm going to be spinning this combed top for the next 30,000 years. :)

That said, silk is my absolute favorite to spin and I prefer spinning threadweight, so this is not a hardship.

(no subject)

Sep. 11th, 2025 09:40 am
oursin: Brush the Wandering Hedgehog by the fire (Default)
[personal profile] oursin
Happy birthday, [personal profile] daegaer and [personal profile] syderia!
yhlee: a fox with the label FOX YOU! (fox you!)
[personal profile] yhlee
Ex Tenebris: a gothic space opera TTRPG [Kickstarter, already funded!].

Beyond the dark emptiness of space, beyond dreaming, lies the Tenebrium. Only you can unearth its mysteries, defeat the twisted horrors that lurk there, and keep humanity from becoming prey.

In Ex Tenebris, you play a ragtag team of investigators, protecting the Republic of Stars from terrifying supernatural threats. You will face sorcerers and cults, dark technology from lost civilisations and the slobbering terrors lurking in the nightmare realm of the Tenebrium.

Ex Tenebris is a complete TTRPG containing all the rules, setting and scenarios that you need to embark on adventures amongst the stars.

[...]

Ex Tenebris takes inspiration from the grotesque imagery of the Aliens movies, the existential dread of Event Horizon, the mysticism of Dune, the dark gothic setting of Warhammer 40,000, and the weird science/magic fusion of Ninefox Gambit.


- Josh Fox, lead designer & writer
- Becky Annison, writer
- Juan Ochoa, illustrator
- Nathan D. Paoletta, layout and graphic design
- Andriy Lukin, logo design
- Jog Brogzin, cartographer
- Chirag Asnani, writer
- Sarah Doom, writer
- Eleanor Hingley, writer
- Kieron Gillen, writer
- Yoon Ha Lee, writer (howdy!)
- Tejas Oza, writer
- Galen Pejeau, writer

first-class merges and cover letters

Sep. 11th, 2025 02:38 am
fanf: (Default)
[personal profile] fanf

https://dotat.at/@/2025-09-11-cover-letter.html

Although it looks really good, I have not yet tried the Jujutsu (jj) version control system, mainly because it's not yet clearly superior to Magit. But I have been following jj discussions with great interest.

One of the things that jj has not yet tackled is how to do better than git refs / branches / tags. As I underestand it, jj currently has something like Mercurial bookmarks, which are more like raw git ref plumbing than a high-level porcelain feature. In particular, jj lacks signed or annotated tags, and it doesn't have branch names that always automatically refer to the tip.

This is clearly a temporary state of affairs because jj is still incomplete and under development and these gaps are going to be filled. But the discussions have led me to think about how git's branches are unsatisfactory, and what could be done to improve them.

branch

One of the huge improvements in git compared to Subversion was git's support for merges. Subversion proudly advertised its support for lightweight branches, but a branch is not very useful if you can't merge it: an un-mergeable branch is not a tool you can use to help with work-in-progress development.

The point of this anecdote is to illustrate that rather than trying to make branches better, we should try to make merges better and branches will get better as a consequence.

Let's consider a few common workflows and how git makes them all unsatisfactory in various ways. Skip to cover letters and previous branch below where I eventually get to the point.

merge

A basic merge workflow is,

  • create a feature branch
  • hack, hack, review, hack, approve
  • merge back to the trunk

The main problem is when it comes to the merge, there may be conflicts due to concurrent work on the trunk.

Git encourages you to resolve conflicts while creating the merge commit, which tends to bypass the normal review process. Git also gives you an ugly useless canned commit message for merges, that hides what you did to resolve the conflicts.

If the feature branch is a linear record of the work then it can be cluttered with commits to address comments from reviewers and to fix mistakes. Some people like an accurate record of the history, but others prefer the repository to contain clean logical changes that will make sense in years to come, keeping the clutter in the code review system.

rebase

A rebase-oriented workflow deals with the problems of the merge workflow but introduces new problems.

Primarily, rebasing is intended to produce a tidy logical commit history. And when a feature branch is rebased onto the trunk before it is merged, a simple fast-forward check makes it trivial to verify that the merge will be clean (whether it uses separate merge commit or directly fast-forwards the trunk).

However, it's hard to compare the state of the feature branch before and after the rebase. The current and previous tips of the branch (amongst other clutter) are recorded in the reflog of the person who did the rebase, but they can't share their reflog. A force-push erases the previous branch from the server.

Git forges sometimes make it possible to compare a branch before and after a rebase, but it's usually very inconvenient, which makes it hard to see if review comments have been addressed. And a reviewer can't fetch past versions of the branch from the server to review them locally.

You can mitigate these problems by adding commits in --autosquash format, and delay rebasing until just before merge. However that reintroduces the problem of merge conflicts: if the autosquash doesn't apply cleanly the branch should have another round of review to make sure the conflicts were resolved OK.

squash

When the trunk consists of a sequence of merge commits, the --first-parent log is very uninformative.

A common way to make the history of the trunk more informative, and deal with the problems of cluttered feature branches and poor rebase support, is to squash the feature branch into a single commit on the trunk instead of mergeing.

This encourages merge requests to be roughly the size of one commit, which is arguably a good thing. However, it can be uncomfortably confining for larger features, or cause extra busy-work co-ordinating changes across multiple merge requests.

And squashed feature branches have the same merge conflict problem as rebase --autosquash.

fork

Feature branches can't always be short-lived. In the past I have maintained local hacks that were used in production but were not (not yet?) suitable to submit upstream.

I have tried keeping a stack of these local patches on a git branch that gets rebased onto each upstream release. With this setup the problem of reviewing successive versions of a merge request becomes the bigger problem of keeping track of how the stack of patches evolved over longer periods of time.

cover letters

Cover letters are common in the email patch workflow that predates git, and they are supported by git format-patch. Github and other forges have a webby version of the cover letter: the message that starts off a pull request or merge request.

In git, cover letters are second-class citizens: they aren't stored in the repository. But many of the problems I outlined above have neat solutions if cover letters become first-class citizens, with a Jujutsu twist.

  • A first-class cover letter starts off as a prototype for a merge request, and becomes the eventual merge commit.

    Instead of unhelpful auto-generated merge commits, you get helpful and informative messages. No extra work is needed since we're already writing cover letters.

    Good merge commit messages make good --first-parent logs.

  • The cover letter subject line works as a branch name. No more need to invent filename-compatible branch names!

    Jujutsu doesn't make you name branches, giving them random names instead. It shows the subject line of the topmost commit as a reminder of what the branch is for. If there's an explicit cover letter the subject line will be a better summary of the branch as a whole.

    I often find the last commit on a branch is some post-feature cleanup, and that kind of commit has a subject line that is never a good summary of its feature branch.

  • As a prototype for the merge commit, the cover letter can contain the resolution of all the merge conflicts in a way that can be shared and reviewed.

    In Jujutsu, where conflicts are first class, the cover letter commit can contain unresolved conflicts: you don't have to clean them up when creating the merge, you can leave that job until later.

    If you can share a prototype of your merge commit, then it becomes possible for your collaborators to review any merge conflicts and how you resolved them.

To distinguish a cover letter from a merge commit object, a cover letter object has a "target" header which is a special kind of parent header. A cover letter also has a normal parent commit header that refers to earlier commits in the feature branch. The target is what will become the first parent of the eventual merge commit.

previous branch

The other ingredient is to add a "previous branch" header, another special kind of parent commit header. The previous branch header refers to an older version of the cover letter and, transitively, an older version of the whole feature branch.

Typically the previous branch header will match the last shared version of the branch, i.e. the commit hash of the server's copy of the feature branch.

The previous branch header isn't changed during normal work on the feature branch. As the branch is revised and rebased, the commit hash of the cover letter will change fairly frequently. These changes are recorded in git's reflog or jj's oplog, but not in the "previous branch" chain.

You can use the previous branch chain to examine diffs between versions of the feature branch as a whole. If commits have Gerrit-style or jj-style change-IDs then it's fairly easy to find and compare previous versions of an individual commit.

The previous branch header supports interdiff code review, or allows you to retain past iterations of a patch series.

workflow

Here are some sketchy notes on how these features might work in practice.

One way to use cover letters is jj-style, where it's convenient to edit commits that aren't at the tip of a branch, and easy to reshuffle commits so that a branch has a deliberate narrative.

  • When you create a new feature branch, it starts off as an empty cover letter with both target and parent pointing at the same commit.

  • Alternatively, you might start a branch ad hoc, and later cap it with a cover letter.

  • If this is a small change and rebase + fast-forward is allowed, you can edit the "cover letter" to contain the whole change.

  • Otherwise, you can hack on the branch any which way. Shuffle the commits that should be part of the merge request so that they occur before the cover letter, and edit the cover letter to summarize the preceding commits.

  • When you first push the branch, there's (still) no need to give it a name: the server can see that this is (probably) going to be a new merge request because the top commit has a target branch and its change-ID doesn't match an existing merge request.

  • Also when you push, your client automatically creates a new instance of your cover letter, adding a "previous branch" header to indicate that the old version was shared. The commits on the branch that were pushed are now immutable; rebases and edits affect the new version of the branch.

  • During review there will typically be multiple iterations of the branch to address feedback. The chain of previous branch headers allows reviewers to see how commits were changed to address feedback, interdiff style.

  • The branch can be merged when the target header matches the current trunk and there are no conflicts left to resolve.

When the time comes to merge the branch, there are several options:

  • For a merge workflow, the cover letter is used to make a new commit on the trunk, changing the target header into the first parent commit, and dropping the previous branch header.

  • Or, if you like to preserve more history, the previous branch chain can be retained.

  • Or you can drop the cover letter and fast foward the branch on to the trunk.

  • Or you can squash the branch on to the trunk, using the cover letter as the commit message.

questions

This is a fairly rough idea: I'm sure that some of the details won't work in practice without a lot of careful work on compatibility and deployability.

  • Do the new commit headers ("target" and "previous branch") need to be headers?

  • What are the compatibility issues with adding new headers that refer to other commits?

  • How would a server handle a push of an unnamed branch? How could someone else pull a copy of it?

  • How feasible is it to use cover letter subject lines instead of branch names?

  • The previous branch header is doing a similar job to a remote tracking branch. Is there an opportunity to simplify how we keep a local cache of the server state?

Despite all that, I think something along these lines could make branches / reviews / reworks / merges less awkward. How you merge should me a matter of your project's preferred style, without interference from technical limitations that force you to trade off one annoyance against another.

There remains a non-technical limitation: I have assumed that contributors are comfortable enough with version control to use a history-editing workflow effectively. I've lost all perspective on how hard this is for a newbie to learn; I expect (or hope?) jj makes it much easier than git rebase.

alpaca adventures, cont'd

Sep. 10th, 2025 04:49 pm
yhlee: Alto clef and whole note (middle C). (Default)
[personal profile] yhlee


Test spin of small experimental alpaca floof batch.

For lagniappe, the completed smol woven object made from my handspun that's headed to [personal profile] eller, mostly wool/silk/angelina blends (both colorways). :3

Wednesday went for a walk in the rain

Sep. 10th, 2025 07:16 pm
oursin: Photograph of small impressionistic metal figurine seated reading a book (Reader)
[personal profile] oursin

What I read

Finished Love at All Ages - think I said most of what I felt moved to say last week, but there was also a certain amount of Mrs Morland whingeing and bitching about the Burdens of Being a Popular Writer (when she wasn't being Amazingly Dotty), whoa, Ange, biting the hand or what?

Sarah Brooks, The Cautious Traveller's Guide to the Wastelands (2024), which I picked up some while ago on promotion and then I think I saw someone writing something about it. I liked the idea but somehow wasn't overwhelmingly enthused?

Read the latest Literary Review.

Since there is a forthcoming online discussion, dug out my 1974 mass market paperback edition of Joanna Russ, The Female Man - I think this was even before excursions to Dark They Were and Golden-Eyed, somehow I had learnt of Fantast, a mailorder operation with duplicated catalogues every few months that purveyed an odd selection of US books. It's quite hard to recall the original impact. Possibly I now prefer her essays?

Carol Atherton, Reading Lessons: The Books We Read at School, the Conversations They Spark, and Why They Matter (2024) - EngLit teacher meditates over books that she had taught, her own reading of them, their impact in the classroom, general issues around teaching Lit, etc - this came up in my Recommended for You in Kobo + on promotion. Quite interesting but how the teaching of EngLit has changed since My Day....

Lee Child, The Hard Way (Jack Reacher, #10) (2006) - every so often I read an interview with or something about Lee Child who sounds very much a Good Guy so I thought I might try one of these and this one was currently on promotion. It's less action and more twisty following intricate plot than I anticipated with lots of sudden reversal, and lots and lots of details. I don't think I'm going to go away and devour all the Reacher books but I can think of circumstances where they might be a preferable option given limited reading materials available.

On the go

I literally just finished that so there is nothing on the go, except one or two things I suppose I am technically still reading.

Up next

Dunno.

(no subject)

Sep. 10th, 2025 09:45 am
oursin: Brush the Wandering Hedgehog by the fire (Default)
[personal profile] oursin
Happy birthday, [personal profile] major_clanger!

processing alpaca floof, cont'd

Sep. 9th, 2025 02:42 pm
yhlee: Alto clef and whole note (middle C). (Default)
[personal profile] yhlee




I used hand carders after washing, then drying outside. It's extremely fluffy (and probably de facto blended with catten floof). I've never spun alpaca before, so that's next!
oursin: Painting of Clio Muse of History by Artemisia Gentileschi (Clio)
[personal profile] oursin

For some reason, concatenation of open tabs on this theme.

Sociability was intrinsic to British politics in the eighteenth-century:

Although women were prevented by custom from voting, holding most patronage appointments or taking seats in the Lords (even if they were peeresses in their own rights), politics ran through the lives of women from politically active families — and their political activities largely took place through the social arena, whether it was in London or in the provinces. Like their male counterparts, they used social situations to gather and disseminate political news and gossip, discuss men and measures, facilitate networking and build or maintain factional allegiances, or seek patronage for themselves or their clients.

***

This Is What Being in Your Twenties Was Like in 18th-Century London:

Browne wrote that he needed money to pay rent—and to purchase stockings, breeches, wigs and other items he deemed necessary for his life in London. “Cloaths which [I] have now are but mean in Comparison [with] what they wear here,” he wrote in one letter.
Financial worries didn’t stop Browne from enjoying his time in the city. “Despite telling his father how short of cash he was, Browne maintained a lively social life, meeting friends and eating and drinking around Fleet Street, close to the Inns of Court,” per the Guardian.
According to the National Trust, Browne’s descriptions of his social life evoke the scenes captured by William Hogarth.

***

The Friendship Book of Anne Wagner (1795-1834):

What is a friendship book? As Dr Lynley Anne Herbert relates in her post for us on a seventeenth-century specimen, it is a lot like an early version of social media, a place to record friendships and social connections.

***

This one is actually Victorian (and I think I may have mentioned before?): Peter McLagan (1823-1900): Scotland’s first Black MP - notes that he was not even the first Black MP to sit in the Commons.

***

And this is actually a bit random: apparently the Niels Bohr Library & Archives 'is a repository and hub for information in the history of physics, astronomy, geophysics, and allied fields' rather than exclusively Bohring. Anyway, an interview with the staff there about what they do.

yhlee: Alto clef and whole note (middle C). (Default)
[personal profile] yhlee
Wrapping up this tiny DIY loom + handspun (the yarns and the silk thread) for [personal profile] eller. :) Mainly bobbin-end leftovers from plying yarns that went to their furever homes. :)



Profile

liadnan: (Default)
liadnan

February 2022

S M T W T F S
  12345
6789101112
13141516171819
20212223242526
2728     

Most Popular Tags

Style Credit

Expand Cut Tags

No cut tags
Page generated Sep. 13th, 2025 01:23 pm
Powered by Dreamwidth Studios