branch: externals/vc-jj
commit 6196546ec88d1a67dc81c0996cb7ce75cbb57767
Author: Kristoffer Balintona <[email protected]>
Commit: Kristoffer Balintona <[email protected]>
fix: Have `vc-jj-bookmark-set' compare full change IDs
Previously, `vc-jj-bookmark-set' would compare to a short version of
the change ID. With the previous commit, now we should compare the
full change ID.
---
vc-jj.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vc-jj.el b/vc-jj.el
index a95881638e..863788fcea 100644
--- a/vc-jj.el
+++ b/vc-jj.el
@@ -778,10 +778,10 @@ user first."
(when (not new-bookmark-p)
(let* ((bookmark-rev
(car (vc-jj--process-lines "show" bookmark "--no-patch"
- "-T"
"self.change_id().shortest() ++ \"\n\"")))
+ "-T" "self.change_id() ++
\"\n\"")))
(bookmark-descendants
(vc-jj--process-lines "log" "--no-graph" "-r" (concat
bookmark-rev "..")
- "-T" "self.change_id().shortest()
++ \"\n\"")))
+ "-T" "self.change_id() ++
\"\n\"")))
(not (member target-rev bookmark-descendants))))))
(when backwards-move-p
(unless (yes-or-no-p
