|author||Ian Jackson <firstname.lastname@example.org>||2018-07-08 18:37:34 +0100|
|committer||Ian Jackson <email@example.com>||2018-07-09 00:24:48 +0100|
git-debrebase convert-from-gbp: Make it ff of dgit view, if we can.
Look for dgit-generated tags so we can usually make the new branch ff of the dgit view. Specifically, we fish the most recent released version out of debian/changelog and look for a DISTRO/VSN tag and a corresponding archive/DISTRO/VSN tag. If this all looks good, we declare ff of archive/. This should avoid the need for dgit push --overwrite in most cases. We do not check the DISTRO name. In principle dgit could find the distro name from the suite name, but that makes the software layering quite complicated. (For example, we would have to provide a way to tell gdr what program to run for dgit, for the benefit of the test suite.) I think the current approach is good enough; there are not likely to be any tag pairs that look like the right kind of thing but are in fact something else entirely, so we're not likely to accidentally trash some wanted changes. Closes:#903132. Signed-off-by: Ian Jackson <firstname.lastname@example.org>
Diffstat (limited to 'git-debrebase.1.pod')
1 files changed, 5 insertions, 0 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 4d1a673..d67e557 100644
@@ -257,6 +257,11 @@ This check exists to detect certain likely user errors,
but if this situation is true and expected,
forcing it is fine.
+git-debrebase will try to look for the dgit archive view
+of the most recent release,
+and if it finds it will make a pseduomerge so that
+your new git-debrebase view is appropriately fast forward.
The result is a well-formed git-debrebase interchange branch.
The result is also fast-forward from the gbp branch.