Because I use Pijul only for personal stuff I un-record patches a lot (to remove conflicts) and it surprises me that it always work, i.e. if I push the right patch there’s no conflict at all. I guess the reason is that after the un-record operation a revert is issued, am I right?
Good question. The Nest doesn’t have a working copy, it just generates pages on the fly from the internal datastructure. This means that in the (hopefully not too distant) future, the Nest will output conflicts as a meaningful combination HTML+JS rather than using the ugly conflict markers.
Thanks for the answer Pierre. Please let me bother you again to be sure I understood.
The Nest doesn’t have a working copy, it just generates pages on the fly from the internal datastructure.
When I un-record something locally I get back the changes that the unrecorded patch introduced (which is expected) and I can revert them or create one or more new patches with them. The Nest doesn’t have an “area” where to store changes, it only knows about patches, so when I unrecord something there, the changes introduced by the unrecorded patch are lost and no clean-up is needed.
Did I get it?
There actually three different things:
- patches
- the graph, sort of a “cache” of applied patches.
- the working copy, which is the set of files you see and edit.
The Nest has the patches and the graph, but no working copy.
2 Likes
(also, just to be even clearer, what I called the “internal datastructure” in my earlier reply is “the graph” in my latest reply).
1 Like
Just as I thought. Thanks for all!