From 2a12188e8b848fdabd86c4fa936fb2e85ede6ac9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 31 Dec 2017 12:16:25 -0400 Subject: response --- ...omment_1_79e18b696ed18c998cd2605cccbf3750._comment | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/forum/__42____42___warning:___42____42___Your___126____47__.propellor__47___is_out_of_date../comment_1_79e18b696ed18c998cd2605cccbf3750._comment (limited to 'doc') diff --git a/doc/forum/__42____42___warning:___42____42___Your___126____47__.propellor__47___is_out_of_date../comment_1_79e18b696ed18c998cd2605cccbf3750._comment b/doc/forum/__42____42___warning:___42____42___Your___126____47__.propellor__47___is_out_of_date../comment_1_79e18b696ed18c998cd2605cccbf3750._comment new file mode 100644 index 00000000..6c8d187a --- /dev/null +++ b/doc/forum/__42____42___warning:___42____42___Your___126____47__.propellor__47___is_out_of_date../comment_1_79e18b696ed18c998cd2605cccbf3750._comment @@ -0,0 +1,19 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2017-12-31T16:03:40Z" + content=""" +You'd update it by git merge with propellor upstream, since your ~/.propellor +in this case is forked from propellor's git repository, rather than the other +option of being a separate git repository that uses propellor as a library. + +I think there should be more to the message than what you showed, +explaining what you'd to do merge. + + warningMessage ("** Your ~/.propellor/ is out of date..") + let also s = hPutStrLn stderr (" " ++ s) + also ("A newer upstream version is available in " ++ distrepo) + if havebranch + then also ("To merge it, run: git merge " ++ upstreambranch) + else also ("To merge it, find the most recent commit in your repository's history that corresponds to an upstream release of propellor, and set refs/remotes/" ++ upstreambranch ++ " to it. Then run propellor again.") +"""]] -- cgit v1.2.3