Repository navigation
Delphi: name workspaces by their place in the tree; links: becomes workspaces: - #39
Merged
Merged
Conversation
…rkspaces: (0.1.0) A workspace's name is its folder's path without workspaces/ (software/application-software/argos/argos-dev), so its branch is ws/<that>; names may share a last part, and check.sh rejects one that is a folder of another's (git can't hold both ws/a and ws/a/b). workspace.yml's links: is workspaces:, listing branches (- ws/<name> or - main), copied to linked/<branch> and checked to exist. sync starts a missing ws/<name> from the old ws/<leaf>, so history and unproposed edits carry over, and notes the old branch. park.sh treats the old and new names as one workspace and drops the .git/delphi fallback; switch.sh takes a name, a branch, or a unique last part. Migration 0.1.0 renames parked slots, old copies in linked/ and version records.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stacked on #37: merge that first, then retarget this PR to main (GitHub does it on its own if #37's branch is deleted).
Names
A workspace's name is its folder's path minus
workspaces/, and its branch isws/plus that name:software/application-software/argos/workspaces/argos-devws/software/application-software/argos/argos-devsoftware/application-software/argos/workspaces/experimentalws/software/application-software/argos/experimentalsoftware/application-software/nero/workspaces/nero-experimentalws/software/application-software/nero/nero-experimentalname:inworkspace.ymlholds that full name. Workspaces in different places may now end in the same last part.check.shrejects a name that is a folder of another's, because git can't hold bothws/aandws/a/b. Example: a workspaceargosat the application-software level, beside the Argos project.switch.shtakes the full name, the branch, or the last part alone when only one workspace ends in it (switch.sh nero-experimental).links:becomesworkspaces:- ws/<name>or- main. They land atlinked/<branch>.check.shverifies each listed workspace exists on main.Moving over
ws/<name>from its oldws/<leaf>branch, so history and unproposed edits carry over. The old branches stay, with a notice.ws/argos-dev: Jeffrey's create-ticket change..git/delphi/), old copies inlinked/, and version records. That letpark.shdrop its.git/delphifallback.After merge (needs a repo admin)
ws/**. Nested names need**, not*.ws/argos-dev,ws/experimentalandws/nero-experimentalonce everyone has moved.Tests
git statuswas clean.