From c8c674477edeb9d91a0fe99b63c1f1f049c7de38 Mon Sep 17 00:00:00 2001 From: Jephte CLAIN Date: Sat, 26 Sep 2015 12:21:44 +0400 Subject: [PATCH 1/2] pxs: support des versions <= 5.20150825 --- uproject | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/uproject b/uproject index aab39db..a6cb16a 100755 --- a/uproject +++ b/uproject @@ -238,11 +238,9 @@ elif array_contains VCS_CMDS "$CMD"; then elif array_contains GITANNEX_CMDS "$CMD"; then function xsync() { if is_yes "$(git config --get annex.direct)"; then - git annex sync --pull --no-commit --no-push --no-content && git annex add && - git annex sync --no-pull --commit --no-push --no-content && - git annex sync --no-pull --no-commit --no-push --content && - git annex sync --no-pull --no-commit --push --no-content && + git annex sync && + git annex sync --content && git annex sync else git annex sync From ea933d501d0409fcdd491de51303137552c2af28 Mon Sep 17 00:00:00 2001 From: Jephte CLAIN Date: Sat, 26 Sep 2015 12:21:50 +0400 Subject: [PATCH 2/2] Init changelog & version 2.17.1 --- CHANGES.txt | 4 ++++ VERSION.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 6c33b51..d52d47f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +## Version 2.17.1 du 26/09/2015-12:21 + +c8c6744 pxs: support des versions <= 5.20150825 + ## Version 2.17.0 du 26/09/2015-11:51 552e4ba améliorer pxs pour un dépôt en mode direct diff --git a/VERSION.txt b/VERSION.txt index d76bd2b..3f8eb71 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -2.17.0 +2.17.1