diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-08 20:05:26 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-09 00:29:00 +0100 |
| commit | 81e93ac2f3ac0b129f0d5e77d055b99053105892 (patch) | |
| tree | bd9d8b4c44a68959546d2a6e8781ddba8ba70fa9 /debian | |
| parent | 9cda023c0c49449a1d5862483df8d785e062765b (diff) | |
git-debrebase convert-from-gbp: Add ffq check
Check that the result will not count as having diverged. This will
usually turn failures to make the ff pseudomerge into -fdiverged.
Related to #903132.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 82f6acc..0afe46a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ dgit (5.9~) unstable; urgency=medium * git-debrebase convert-from-gbp: Look for dgit-generated tags so we can usually make the new branch ff of the dgit view. Closes:#903132. + * git-debrebase convert-from-gbp: Check that the result will not + count as having diverged. This will usually turn failures to make + the ff pseudomerge into -fdiverged. Related to #903132. -- |