Skip to content

Commit b6b26be

Browse files
committed
docs(CHANGES) clarify duplicate merge defaults for users
why: The previous changelog entry listed internal implementation details; users need a product-level summary of what happens by default and the flags available. what: - reword the `vcspull add`, `discover`, and loader sections to describe user experience, default behavior, and opt-outs in plain language - keep existing section structure while aligning phrasing with the rest of the release notes
1 parent 6dc41b6 commit b6b26be

File tree

1 file changed

+14
-18
lines changed

1 file changed

+14
-18
lines changed

CHANGES

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,30 +42,26 @@ _Upcoming changes will be written here._
4242
- Adds `--no-merge` for workflows that need to preserve duplicate entries while
4343
still seeing diagnostic warnings.
4444

45-
#### `vcspull add`: Fixes and streamlining for configuration read/writing (#480)
46-
47-
- Loads configs with the duplicate-aware parser before editing so existing
48-
workspace roots are merged instead of silently overwritten.
49-
- Accepts repositories by path (`vcspull add ~/study/python/project`), detects
50-
`origin` remotes, and prompts for confirmation. Use `--yes` to auto-approve
51-
scripted runs.
52-
- Adds `--no-merge` so `vcspull add` can skip auto-merging duplicates while
53-
still surfacing warnings for manual follow-up.
54-
- CLI previews contract workspace paths to `~/…` for consistency with other
55-
commands and easier scanning.
45+
#### `vcspull add` protects workspace configs during imports (#480)
46+
47+
- Default behavior now merges duplicate workspace roots so prior entries stay
48+
intact; add `--no-merge` to keep the raw sections and handle them yourself.
49+
- You can invoke `vcspull add ~/study/python/project`; the command inspects the
50+
path, auto-fills the `origin` remote, shows the tilde-shortened workspace, and
51+
asks for confirmation unless you supply `--yes`.
52+
- CLI previews now contract `$HOME` to `~/…`, matching the rest of the UX.
5653

5754
#### `vcspull discover` honors --no-merge (#480)
5855

59-
- `vcspull discover --no-merge` surfaces duplicate workspace roots without
60-
rewriting existing config entries.
56+
- Running `vcspull discover --no-merge` only reports duplicates—it leaves the
57+
file untouched until you decide to act.
6158

6259
#### Configuration loader: Support for duplicate workspace roots (#480)
6360

64-
- `load_configs` now consumes the duplicate-aware loader so commands like
65-
`vcspull list`, `vcspull status`, and `vcspull sync` keep every repository
66-
even when configuration files repeat workspace sections.
67-
- Developers can opt out with `merge_duplicates=False`, which preserves the
68-
legacy "last occurrence wins" semantics while logging a warning.
61+
- Commands backed by `load_configs` (`list`, `status`, `sync`, etc.)
62+
automatically keep every repository even when workspace sections repeat; pass
63+
`merge_duplicates=False` to fall back to the legacy "last entry wins"
64+
behavior with a warning.
6965

7066
### Development
7167

0 commit comments

Comments
 (0)