diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-01-06 01:50:00 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-01-06 01:50:01 +0000 |
| commit | ef9fb96766ba8b8eaba540a760efa4db4b1bb5da (patch) | |
| tree | 58b570a199783f262fd848d8a59a73dcf3520307 /debian | |
| parent | 0f141266f28e1cf9ffb421d7362596825fbe6acb (diff) | |
dgit: Fix suggested diff rune in split brain mode
In split brain mode, with unexpected diffs, print dgit view commitid
in suggested diff rune.
HEAD is wrong in this case.
Closes:#886443.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 087dc21..aa98a41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ dgit (4.2~) experimental; urgency=medium Sean Whitton] Closes:#856402. Minor fixes: + * In split brain mode, with unexpected diffs, print dgit view + commitid in suggested diff rune. (HEAD is wrong.) Closes:#886443. * Fix message about missing quilt cache entry to refer to HEAD rather than tree, since dgit needs a commit. Closes:#884646. * Fix grammar error in 4.1 changelog entry. [Sean Whitton] |