bookmark create/set --only: say that it can leave a file partly edited b9bf7eec1f2d
--only takes just the change and its dependencies, so other changes to the
same files are left out and a file can come out partly edited. The help
for create and set and the guide now say so, and how to add one change to
a bookmark's work: bookmark set NAME <its heads> CHANGE.
closes #110, refs #103
Author Andy McCall @andymccall <[email protected] > When 23 days ago · 2026-10-13 07:05 UTCSignature ✔ signed by Andy McCallHash b9bf7eec1f2d11a8260d422b2f8d03c74572b0fa2b0b87784f13a98ad17dd2ff Depends on 06d16dc2bc13 4fe7d6045860 ee06a6c557b7 fce44ae9ad29 Depended on by nothing yet In bookmarks carried-not-removed doctor-trust identical-sides keyless-tags main merge-remote-bookmark only-help-103 paths-for-resolutions-and-amend push-notes show-stat subrepo-pin-state In tags v0.10.0 v0.11.0 v0.4.4 v0.4.5 v0.4.6 v0.5.0 v0.5.1 v0.6.0 v0.7.0 v0.8.0 v0.9.0 Edits 4 atoms, 0 tree operations, 2 files
Browse the tree at this change
docs/guide.md src/cli/mod.rs
modified
docs/guide.md
+6 −0
…
122 unchanged lines
123
123
bookmark to resolve conflicts, `oxy bookmark set NAME CHANGE --upto`
124
124
keeps everything the bookmark held.
125
125
126
+
`--only` is exact, and that can surprise: other changes to the same files
127
+
are left out, so a file can come out partly edited (a pipeline file that
128
+
no longer parses, say). To put one change on top of a bookmark's work,
129
+
give that bookmark's heads with it, as `oxy bookmark show main` prints
130
+
them: `oxy bookmark set fix <main's heads> 745307b4`.
131
+
126
132
`oxy bookmark switch` says when the bookmark you switch to lacks changes
127
133
that the one you left has.
128
134
…
378 unchanged lines
modified
src/cli/mod.rs
+8 −2
…
525 unchanged lines
526
526
/// branch at a commit would hold
527
527
#[arg(long, conflicts_with = "only")]
528
528
upto: bool,
529
-
/// Just CHANGE... and what they depend on
529
+
/// Just CHANGE... and what they depend on. Other changes to the
530
+
/// same files are left out, so a file can come out partly edited;
531
+
/// to add one change to a bookmark's work, give the bookmark's
532
+
/// heads with it instead: `bookmark set NAME <its heads> CHANGE`
530
533
#[arg(long)]
531
534
only: bool,
532
535
},
…
9 unchanged lines
542
545
/// moved to a commit would hold
543
546
#[arg(long, conflicts_with = "only")]
544
547
upto: bool,
545
-
/// Just CHANGE... and what they depend on
548
+
/// Just CHANGE... and what they depend on. Other changes to the
549
+
/// same files are left out, so a file can come out partly edited;
550
+
/// to add one change to a bookmark's work, give the bookmark's
551
+
/// heads with it instead: `bookmark set NAME <its heads> CHANGE`
546
552
#[arg(long)]
547
553
only: bool,
548
554
},
…
686 unchanged lines