comparison setup.py @ 17319:a189d4470a34 stable

transplant: handle non-empty patches doing nothing (issue2806) If patch.patch() reports patched files when applying a changeset and the following commit says nothing changed, transplant used to abort with a RuntimeError, assuming something went wrong with patching. The mismatch is patch.patch() reports patched files, not changed ones. It could be modified to report changed files but it means duplicating work from status, may be expensive in the case of binary files, and is probably not that useful at API level. For instance, if two patches are applied on the working directory, the outcome may be nothing changed while each call would have returned modified files. The caller would have to call status() itself again. This patch fixes the issue by trusting patching code: if the patch succeeded and commit reports nothing changed, then nothing changed, patch() did not "dropped changes on the floor".
author Patrick Mezard <patrick@mezard.eu>
date Tue, 31 Jul 2012 17:39:32 +0200
parents bf5bb38bcc7c
children 318fb32b980e
comparison
equal deleted inserted replaced
17318:7ac5800dbc8f 17319:a189d4470a34