From 21b9453d59e87d1d5db4f52ef8204e40852e6c28 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Sat, 1 Jun 2024 12:14:25 -0700 Subject: [PATCH] `jj help`: note that `move`, `checkout`, and `merge` as deprecated --- cli/src/commands/checkout.rs | 3 ++- cli/src/commands/mod.rs | 2 +- cli/src/commands/move.rs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cli/src/commands/checkout.rs b/cli/src/commands/checkout.rs index 6f206f633..913fce518 100644 --- a/cli/src/commands/checkout.rs +++ b/cli/src/commands/checkout.rs @@ -20,7 +20,8 @@ use crate::command_error::CommandError; use crate::description_util::join_message_paragraphs; use crate::ui::Ui; -/// Create a new, empty change and edit it in the working copy +/// Create a new, empty change and edit it in the working copy (DEPRECATED, use +/// `jj new`) /// /// For more information, see /// https://github.com/martinvonz/jj/blob/main/docs/working-copy.md. diff --git a/cli/src/commands/mod.rs b/cli/src/commands/mod.rs index 8ba56d124..1f097e5e7 100644 --- a/cli/src/commands/mod.rs +++ b/cli/src/commands/mod.rs @@ -97,7 +97,7 @@ enum Command { Init(init::InitArgs), Interdiff(interdiff::InterdiffArgs), Log(log::LogArgs), - /// Merge work from multiple branches + /// Merge work from multiple branches (DEPRECATED, use `jj new`) /// /// Unlike most other VCSs, `jj merge` does not implicitly include the /// working copy revision's parent as one of the parents of the merge; diff --git a/cli/src/commands/move.rs b/cli/src/commands/move.rs index c43b0e869..1bcea4670 100644 --- a/cli/src/commands/move.rs +++ b/cli/src/commands/move.rs @@ -21,7 +21,7 @@ use crate::cli_util::{CommandHelper, RevisionArg}; use crate::command_error::{user_error, CommandError}; use crate::ui::Ui; -/// Move changes from one revision into another +/// Move changes from one revision into another (DEPRECATED, use `jj squash`) /// /// Use `--interactive` to move only part of the source revision into the /// destination. The selected changes (or all the changes in the source revision