From cfcc7c5e3465c403121a8aa88b444e3dc58b58a1 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Tue, 30 Jan 2024 23:28:11 -0800 Subject: [PATCH] test_rewrite: Fixup test comment after becbc88 --- lib/tests/test_rewrite.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/tests/test_rewrite.rs b/lib/tests/test_rewrite.rs index afea5ff7e..4af1f5dce 100644 --- a/lib/tests/test_rewrite.rs +++ b/lib/tests/test_rewrite.rs @@ -1622,8 +1622,11 @@ fn test_rebase_abandoning_empty() { // Rebase B onto B2, where B2 and B have the same tree, abandoning all empty // commits. // - // We expect B, D, and G to be skipped because they're empty, but not E because - // it's the working commit. F also remains as it's not empty. + // We expect B, D, E and G to be skipped because they're empty. F remains + // as it's not empty. Since the working copy commit E is skipped, a new working + // copy commit should be created in its stead, just as would have happened if we + // did a normal rebase and then manually abandoned the working copy with `jj + // abandon`. // // F G (empty) // |/