diff tests/test-fix.t @ 44574:5205b46bd887

fix: add a -s option to format a revision and its descendants `hg fix -r abc123` will format that commit but not its descendants. That seems expected given the option name (`-r`), but it's very rarely what the user wants to do. The problem is that any descendants of that commit will not be formatted, leaving them as orphans that are hard to evolve. They are hard to evolve because the new parent will have formatting changes that the orphan doesn't have. I talked to Danny Hooper (who wrote most of the fix extension) about the problem and we agreed that deprecating `-r` in favor of a new `-s` argument (mimicing rebase's `-s`) would be a good way of reducing the risk that users end up with these hard-to-evolve orphans. So that's what this patch implements. Differential Revision: https://phab.mercurial-scm.org/D8287
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 13 Mar 2020 12:16:00 -0700
parents 84a0102c05c7
children a6ef1e8e2f6d
line wrap: on
line diff
--- a/tests/test-fix.t	Thu Dec 12 16:32:01 2019 -0800
+++ b/tests/test-fix.t	Fri Mar 13 12:16:00 2020 -0700
@@ -104,12 +104,13 @@
   
   options ([+] can be repeated):
   
-      --all          fix all non-public non-obsolete revisions
-      --base REV [+] revisions to diff against (overrides automatic selection,
-                     and applies to every revision being fixed)
-   -r --rev REV [+]  revisions to fix
-   -w --working-dir  fix the working directory
-      --whole        always fix every line of a file
+      --all            fix all non-public non-obsolete revisions
+      --base REV [+]   revisions to diff against (overrides automatic selection,
+                       and applies to every revision being fixed)
+   -r --rev REV [+]    revisions to fix
+   -s --source REV [+] fix the specified revisions and their descendants
+   -w --working-dir    fix the working directory
+      --whole          always fix every line of a file
   
   (some details hidden, use --verbose to show complete help)