From e59a0b8ce7f3f6660a39025afd740d53845ffb94 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 21 Jun 2023 14:45:36 -0400 Subject: [PATCH] apparently fixed --- .../import_tree_on_adjusted_unlocked_branch_issues.mdwn | 2 ++ .../comment_3_c75eee397fc6a53aa0ff55f993b790a7._comment | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 doc/bugs/import_tree_on_adjusted_unlocked_branch_issues/comment_3_c75eee397fc6a53aa0ff55f993b790a7._comment diff --git a/doc/bugs/import_tree_on_adjusted_unlocked_branch_issues.mdwn b/doc/bugs/import_tree_on_adjusted_unlocked_branch_issues.mdwn index 09d6bf3725..e668942315 100644 --- a/doc/bugs/import_tree_on_adjusted_unlocked_branch_issues.mdwn +++ b/doc/bugs/import_tree_on_adjusted_unlocked_branch_issues.mdwn @@ -7,3 +7,5 @@ It does not fail, but I think this is actually an indication of a bug. The ref is a merge commit, because it's imported a tree from a special remote, and merged it. Which is a reasonable thing to want to do, even when on an adjusted branch. So, this needs to be dealt with somehow. --[[Joey]] + +> [[done]] I think? --[[Joey]] diff --git a/doc/bugs/import_tree_on_adjusted_unlocked_branch_issues/comment_3_c75eee397fc6a53aa0ff55f993b790a7._comment b/doc/bugs/import_tree_on_adjusted_unlocked_branch_issues/comment_3_c75eee397fc6a53aa0ff55f993b790a7._comment new file mode 100644 index 0000000000..304967ade9 --- /dev/null +++ b/doc/bugs/import_tree_on_adjusted_unlocked_branch_issues/comment_3_c75eee397fc6a53aa0ff55f993b790a7._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2023-06-21T18:44:09Z" + content=""" +The test suite doesn't output that any more, so I'm going to assume this is +fixed. +"""]]