From 0db84b872dd2f7831026b089645a01ce43ef70e0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jan 2017 17:32:31 -0400 Subject: comment --- .../comment_1_62b47d7c0530c2988b7e6e998878b920._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/todo/Merging_from___47__usr__47__src__47__propellor_broken_now_CHANGELOG_not_a_symlink/comment_1_62b47d7c0530c2988b7e6e998878b920._comment (limited to 'doc/todo/Merging_from___47__usr__47__src__47__propellor_broken_now_CHANGELOG_not_a_symlink') diff --git a/doc/todo/Merging_from___47__usr__47__src__47__propellor_broken_now_CHANGELOG_not_a_symlink/comment_1_62b47d7c0530c2988b7e6e998878b920._comment b/doc/todo/Merging_from___47__usr__47__src__47__propellor_broken_now_CHANGELOG_not_a_symlink/comment_1_62b47d7c0530c2988b7e6e998878b920._comment new file mode 100644 index 00000000..886c2534 --- /dev/null +++ b/doc/todo/Merging_from___47__usr__47__src__47__propellor_broken_now_CHANGELOG_not_a_symlink/comment_1_62b47d7c0530c2988b7e6e998878b920._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2017-01-01T21:29:52Z" + content=""" +I have reverted that change for now. + +I don't think the /usr/src/propellor/ merge has anything specific to do +with the changelog, so there is probably a general case where that merge +fails to work. I guess it involves a file's type changing. +"""]] -- cgit v1.2.3