ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/docs/design
Yuya Nishihara ce0821f06d docs: adjust tracking branches design to deal with "fetch/push && undo"
The original idea was to completely replace git_refs with remotes["git"] by
introducing "forgotten" state, but it turned out to break "fetch && undo"
scenario. There are other ways around, but they also have problems:

* Sets tombstone on forgotten/deleted remote refs, exports remote refs without
  comparing to the known refs.
  * `jj undo` would need to insert tombstone by diffing old/new views.
  * `jj branch forget` would need to preserve the @git branch whereas the other
    remote branches would be forgotten.
* Always overwrites remote refs on export.
  * `jj git export` without importing would discard remote refs.

So, I decided to not remove git_refs. Apparently, it also improves the undo
behavior. In the new model, `jj git fetch && jj undo && jj git fetch` works
even if git_refs isn't rolled back. So we can unify the default of
`jj undo --what`.
2023-09-28 18:00:25 +09:00
..
git-submodule-storage.md docs/design: propose submodule storage approach 2023-04-24 14:29:47 -07:00
git-submodules.md
run.md docs/design: Clarify run.md a bit. 2023-09-14 16:39:40 +02:00
tracking-branches.md docs: adjust tracking branches design to deal with "fetch/push && undo" 2023-09-28 18:00:25 +09:00