| Commit message (Collapse) | Author | Age |
|---|
| |
|
|
|
|
|
|
|
| |
Now dgit runs git-debrebase make-patches, with the result that the
patch commit in this conflict will be made by gdr.
This is what we want, so now that we have it, insist on it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
|
|
|
|
|
|
|
|
| |
We are about to extend the set of situations where dgit runs
git-debrebase make-patches, with the result that the patch commit in
this conflict will be made by gdr.
This is good, so allow it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
|
|
|
|
|
|
| |
The pattern `dch -r sid' is actually wrong and we will want to change
it. See #903441 and #903598. For future-proofing, factor this out
before we fix it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
|
|
|
|
|
|
| |
In practical terms this is needed because we are only using one tree,
and otherwise the nmu's dgit push will update dgit/dgit/sid, causing
the ffq check to fail (when we fix it, in a moment).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
