From a9a6152725262b9061e5ee55d69efc579817bbf4 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Wed, 16 Nov 2016 16:03:30 -0800 Subject: [PATCH] update.sh: fix bzr mirror update marks handling Ever since bzr support was first added in 94186c32b5 (Add support for mirroring bzr repos, 2010-01-28), the clone part of the process has been writing marks to a bfe-marks file but the update side of the process has been expecting a file named dfe-marks instead -- apparently a result of a copy-and-paste error when bzr support was first added. Correct this by making the update side of the process use the correct, bfe-marks, file name. Apparently the bzr support has not been used very much. It would still probably work it's just that the first update would end up redoing all the work of the initial clone and possibly timing out if the clone is large. Signed-off-by: Kyle J. McKay --- jobd/update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jobd/update.sh b/jobd/update.sh index 8f4b6ef..5f091d1 100755 --- a/jobd/update.sh +++ b/jobd/update.sh @@ -75,8 +75,8 @@ git_bzr_fetch() ( { _e1=0 bzr fast-export --plain \ - --export-marks="$(pwd)/dfe-marks" \ - --import-marks="$(pwd)/dfe-marks" "$1" 3>&- || _e1=$? + --export-marks="$(pwd)/bfe-marks" \ + --import-marks="$(pwd)/bfe-marks" "$1" 3>&- || _e1=$? echo $_e1 >&3 } | \ { -- 2.11.4.GIT