From 60b4f46cf0a103089163736e6fbf5b2fd62960aa Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 5 Apr 2017 18:14:24 +0100 Subject: [PATCH] git-debrebase: found Signed-off-by: Ian Jackson --- README.git-debrebase | 72 +++++++++++++++++++++++--------------------- git-debrebase | 2 +- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/README.git-debrebase b/README.git-debrebase index cf003455..fc96cd82 100644 --- a/README.git-debrebase +++ b/README.git-debrebase @@ -106,44 +106,46 @@ Consider a non-dgit NMU followed by a dgit NMU: - interchange --/--B3!--%--/----E---> - / / - % 4 - / 3 - / 2 - / 1 - 2* &_ - / /| \ - 1 0 00 =XBCD - / - / - --p--A---> breakwater - / - --#--------> upstream - - - Key: - + interchange --/--B3!--%--/----D*--> + / / + % 4 + / 3 + / 2 + / 1 + 2* &_ + / /| \ + 1 0 00 =XBC% + / + / + --p--A---> breakwater + / + --#--------> upstream + + + Key: + =XBC% dgit tarball import of .debian.tar.gz containing Debian packaging including changes B C and patches - + 0 dgit tarball import of upstream tarball - + 00 dgit tarball import of supplementary upstream tarball - + &_ dgit nearly-breakwater import - + &' git-debrebase converted import - + D' git-debrebase converted debian/ changes import - + + * ** before and after HEAD + Want to transform this into: - I. No new upstream version (0 + 00 eq #) + I. No new upstream version (0 + 00 eq #) - --/--B3!--%--/------D--------------/--> + --/--B3!--%--/------D*-------------/--> / / / - % 4 4 + % 4 4** / 3 3 / 2 2 / 1 1 @@ -152,18 +154,18 @@ Want to transform this into: 1 0 00 =XBC% / / / / / - --p--A-----B-----------------------C--D---> - / - --#-----------------------------------------> - - - II. New upstream (0 + 00 neq #) + --p--A-----B-----------------------C--D---> + / + --#-----------------------------------------> + + + II. New upstream (0 + 00 neq #) interchange - --/--B3!--%--/------E--------------/--> + --/--B3!--%--/------E*-------------/--> / / / - % 4 4 + % 4 4** / 3 3 / 2 2 / 1 1 diff --git a/git-debrebase b/git-debrebase index 4cd2203a..8c1dba80 100755 --- a/git-debrebase +++ b/git-debrebase @@ -286,7 +286,7 @@ sub classify ($) { return $unknown->("complex merge"); } -sub launder ($$$;$$$) { +sub walk ($$$;$$$) { my ($input, $pseudos_must_overwrite_this, $wantdebonly, $report, $depth, $report_anomaly, $nogenerate) = @_; # go through commits backwards -- 2.30.2