Commit Diff

Commit:
a510db74fc60784c1f296b6acc484731bd3cec29
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas.adam22@gmail.com>
Date:
Message:
tweak previous: when using so many words, might as well mention fetch
Actions:
Patch | Tree
commit - 702e6fa445b6c682ff2f3812fc965dfcb9da83c9
commit + a510db74fc60784c1f296b6acc484731bd3cec29
blob - cde5665da8ec47a1e913e59d832517954217d59c
blob + 299c6f00e55978193be08b6c84aad05f5f196b85
--- lib/error.c
+++ lib/error.c
@@ -200,7 +200,7 @@ static const struct got_error got_errors[] = {
 	{ GOT_ERR_SEND_BAD_REF, "reference cannot be sent" },
 	{ GOT_ERR_SEND_FAILED, "could not send pack file" },
 	{ GOT_ERR_SEND_EMPTY, "no references to send" },
-	{ GOT_ERR_SEND_ANCESTRY, "branch on server has a different ancestry; either rebase or merge local branch before sending, or ignore ancestry with send -f (can lead to data loss on server)" },
+	{ GOT_ERR_SEND_ANCESTRY, "branch on server has a different ancestry; either fetch changes from server and then rebase or merge local branch before sending, or ignore ancestry with send -f (can lead to data loss on server)" },
 	{ GOT_ERR_CAPA_DELETE_REFS, "server cannot delete references" },
 	{ GOT_ERR_SEND_DELETE_REF, "reference cannot be deleted" },
 	{ GOT_ERR_SEND_TAG_EXISTS, "tag already exists on server" },
blob - 210ee530b5a7d6ed0c4acce42ce8f7a571df8ddf
blob + 2dc1ca89112c06945139d118d2b88d6945dc2a3a
--- regress/cmdline/send.sh
+++ regress/cmdline/send.sh
@@ -193,7 +193,9 @@ EOF
 	echo -n "got: refs/heads/master: " > $testroot/stderr.expected
 	echo -n "branch on server has a different ancestry; " \
 		>> $testroot/stderr.expected
-	echo -n "either rebase or merge local branch before sending, or " \
+	echo -n "either fetch changes from server and then " \
+		>> $testroot/stderr.expected
+	echo -n "rebase or merge local branch before sending, or " \
 		>> $testroot/stderr.expected
 	echo "ignore ancestry with send -f (can lead to data loss on server)" \
 		>> $testroot/stderr.expected