| commit | e0d32236084276e0e509180ab7629ab23aee11c5 | |
| author | Yann Dirson <ydirson@altern.org> | |
| Wed, 28 Feb 2007 08:41:42 +0000 (28 08:41 +0000) | ||
| committer | Catalin Marinas <catalin.marinas@gmail.com> | |
| Wed, 28 Feb 2007 08:41:42 +0000 (28 08:41 +0000) | ||
| tree | 8499fe6e5338d32d67b4ac1979ff744cf30fb1c8 | treesnapshot (tar.gz zip) |
| parent | 5a6d315ee8e8b217aa2720c4e44af8d17a4cd28c | commitdiff |
Add a testcase for the safety of pull-policy='pull'.
This testcase demonstrates a long-standing problem with the handling
of conflicts on a rewinding branch, when "stg pull" calls git-pull.
Signed-off-by: Yann Dirson <ydirson@altern.org>
This testcase demonstrates a long-standing problem with the handling
of conflicts on a rewinding branch, when "stg pull" calls git-pull.
Signed-off-by: Yann Dirson <ydirson@altern.org>
| t/t2101-pull-policy-pull.sh | [new file with mode: 0755] | blob |
| t/t2102-pull-policy-rebase.sh | [new file with mode: 0755] | blob |