Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
- 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
=XBC% dgit tarball import of .debian.tar.gz containing
Debian packaging including changes B C and patches
0 dgit tarball import of upstream tarball
0 dgit tarball import of upstream tarball
00 dgit tarball import of supplementary upstream tarball
00 dgit tarball import of supplementary upstream tarball
&_ dgit nearly-breakwater import
&_ dgit nearly-breakwater import
&' git-debrebase converted import
&' git-debrebase converted import
D' git-debrebase converted debian/ changes import
D' git-debrebase converted debian/ changes import
+
+ * ** before and after HEAD
+
Want to transform this into:
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*-------------/-->
- --p--A-----B-----------------------C--D--->
- /
- --#----------------------------------------->
-
-
- II. New upstream (0 + 00 neq #)
+ --p--A-----B-----------------------C--D--->
+ /
+ --#----------------------------------------->
+
+
+ II. New upstream (0 + 00 neq #)
- --/--B3!--%--/------E--------------/-->
+ --/--B3!--%--/------E*-------------/-->
return $unknown->("complex merge");
}
return $unknown->("complex merge");
}
my ($input, $pseudos_must_overwrite_this, $wantdebonly,
$report, $depth, $report_anomaly, $nogenerate) = @_;
# go through commits backwards
my ($input, $pseudos_must_overwrite_this, $wantdebonly,
$report, $depth, $report_anomaly, $nogenerate) = @_;
# go through commits backwards