diff options
| author | Karl Wiberg <kha@treskal.com> | 2011-06-01 08:26:57 +0200 |
|---|---|---|
| committer | Karl Wiberg <kha@treskal.com> | 2011-06-01 09:16:14 +0200 |
| commit | 507b64d49762a88c6c63c052a5196df7a10a7cf8 (patch) | |
| tree | 5a551714f852b8e75d58c348c38d0414e96160a1 | |
| parent | 31c3f7c9c8f175fd06fa565ea905be30b57b6e88 (diff) | |
| download | stgit-507b64d49762a88c6c63c052a5196df7a10a7cf8.tar.gz | |
Don't clear the list of changed patches when we hit a push conflict
This fixes the failing test added in the previous patch. Bug
discovered by and fixed in collaboration with Dan Härdfeldt.
The offending line was added in
ba52890d Record a single transaction for conflicting push operations
but I can't see why.
Signed-off-by: Karl Wiberg <kha@treskal.com>
| -rw-r--r-- | stgit/lib/transaction.py | 1 | ||||
| -rwxr-xr-x | t/t1503-float-conflict-2.sh | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/stgit/lib/transaction.py b/stgit/lib/transaction.py index 25cc34b..252693e 100644 --- a/stgit/lib/transaction.py +++ b/stgit/lib/transaction.py @@ -361,7 +361,6 @@ class StackTransaction(object): # We've just caused conflicts, so we must allow them in # the final checkout. self.__allow_conflicts = lambda trans: True - self.__patches = _TransPatchMap(self.__stack) # Update the stack state if comm: diff --git a/t/t1503-float-conflict-2.sh b/t/t1503-float-conflict-2.sh index 661b711..dc2b6c5 100755 --- a/t/t1503-float-conflict-2.sh +++ b/t/t1503-float-conflict-2.sh @@ -29,7 +29,7 @@ foo2 >>>>>>> patched EOF -test_expect_failure 'Float a patch, causing a conflict two patches down' ' +test_expect_success 'Float a patch, causing a conflict two patches down' ' conflict stg float p1 && test "$(echo $(stg series))" = "+ p0 + p2 > p3 - p1" && test "$(stg id p3)" = "$(git rev-list HEAD~0 -n 1)" && |