summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.git-debrebase167
-rwxr-xr-xgit-debrebase11
2 files changed, 89 insertions, 89 deletions
diff --git a/README.git-debrebase b/README.git-debrebase
index fc96cd8..eed1754 100644
--- a/README.git-debrebase
+++ b/README.git-debrebase
@@ -13,10 +13,10 @@ with a series of pseudomerges to make it fast-forwarding.
/ / /
1 1 1 `breakwater' branch, merging baseline
/ / / unmodified upstream code
- ---p-----p--A----p--B--C--> plus debian/ (but no debian/patches)
- / / /
- --#-----#-------#-----> upstream
-
+ ---p-----p--A----p--B--C plus debian/ (but no debian/patches)
+ / / / no ref refers to this: we
+ --#-----#-------#-----> upstream reconstruct its identity by
+ inspecting interchange branch
Key:
1,2,3 commits touching upstream files only
@@ -55,27 +55,28 @@ take (for example) B4, above, and be able to perform functions like:
* Strip pseudomerges: Rewrite the current branch so it contains no
pseudomerges, turning ...B3 into ...p-A-1-2-B3. (This should
- make a note, in your .git/ somewhere, of the latest pseudomerge to
- be deleted.)
+ make a note, in your .git/ somewhere, of the original branch
+ tip so that it can be overwritten with a pseudomerge.)
* Cleanup branch: Reorganise the current branch so that the debian/
changes come first, turning -p-A-1-2-B3 into ...p-A-B-1-2-3.
* New upstream rebase: Start rebasing onto a new upstream version,
- turning ...#...p-A-B-1-2-3 into ...#'.A-B-p'-1-2. This would be a
- wrapper around git-rebase, which prepares p' and then tries to
- rebase 1 2 onto p'. So if you ask for an interactive rebase p'
- doesn't appear in your commit list.
+ turning ...#..p-A-B-1-2-3 into (...#..p-A-B-|...#'-)p'-1-2. This
+ would be a wrapper around git-rebase, which prepares p' and then
+ tries to rebase 1 2 onto p'. So if you ask for an interactive
+ rebase p' doesn't appear in your commit list.
- Note that the rebasing of p into p' cannot fail because p' simply
+ Note that the construction of p' cannot fail because p' simply
copies debian/ from B and and everything else from #'. (Rebasing A
and B is undesirable. We want the debian/ files to be non-rebasing
so we can `git log' and get the packaging history.)
* Record pseudomerge. This is like "committing" your patch queue.
- The LH parent is taken from the previous strip pseudomerge. (We
- should probably check that this is consistent with what we see in
- debian/changelog, but that is not a sufficient check.)
+ The LH parent is taken from the previously recorded tip. (We could
+ perhaps check that this is consistent with what we see in
+ debian/changelog, but that is not a sufficient check so the
+ recorded tip check is primary.)
Maybe some of these operations should automatically edit
debian/changelog.
@@ -101,81 +102,77 @@ would get if you untarred the origs and the debian.tar.gz, and then
deleted all the patches without applying them.
+dgit import handling
+--------------------
Consider a non-dgit NMU followed by a dgit NMU:
-
-
-
- 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
-
+
+
+
+ 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
-
+ &_ dgit nearly-breakwater import
+ &' git-debrebase converted import (upstream files only)
+ D' git-debrebase converted debian/ changes import
+
* ** before and after HEAD
-
-Want to transform this into:
-
- I. No new upstream version (0 + 00 eq #)
-
- --/--B3!--%--/------D*-------------/-->
- / / /
- % 4 4**
- / 3 3
- / 2 2
- / 1 1
- 2* &_ /
- / /| \ /
- 1 0 00 =XBC% /
- / /
- / /
- --p--A-----B-----------------------C--D--->
- /
- --#----------------------------------------->
-
-
- II. New upstream (0 + 00 neq #)
-
- interchange
-
- --/--B3!--%--/------E*-------------/-->
- / / /
- % 4 4**
- / 3 3
- / 2 2
- / 1 1
- 2* &_ /
- / /| \ /
- 1 0 00 =XBC% /
- / /
- / /
- --p--A-----B--------------------p--C--D--->
- / /
+
+Want to transform this into:
+
+ I. No new upstream version (0 + 00 eq #)
+
+ --/--B3!--%--/------D*-------------/-->
+ / / /
+ % 4 4**
+ / 3 3
+ / 2 2
+ / 1 1
+ 2* &_ /
+ / /| \ /
+ 1 0 00 =XBC% /
+ / /
+ / /
+ --p--A-----B-----------------------C--D
+ /
+ --#----------------------------------------->
+
+
+ II. New upstream (0 + 00 neq #)
+
+ --/--B3!--%--/------E*-------------/-->
+ / / /
+ % 4 4**
+ / 3 3
+ / 2 2
+ / 1 1
+ 2* &_ /
+ / /| \ /
+ 1 0 00 =XBC% /
+ / /
+ / /
+ --p--A-----B--------------------p--C--D
+ / /
--#----------------------- - - / - - ----->
/
&'
diff --git a/git-debrebase b/git-debrebase
index e000e55..9ec909f 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -87,6 +87,10 @@
# refs/ffqrebase-prev/BRANCH BRANCH may be refs/...; if not it means
# refs/ffqrebase-base/BRANCH refs/heads/BRANCH
# zero, one, or both of these may exist
+s
+# git-debrebase without start, if already started, is willing
+# to strip pseudomerges provided that they overwrite (xxx exactly ???)
+# the previous HEAD
use strict;
@@ -288,7 +292,7 @@ sub classify ($) {
sub walk ($$$;$$$) {
my ($input, $pseudos_must_overwrite_this, $wantdebonly,
- $report, $depth, $report_anomaly, $nogenerate) = @_;
+ $report, $depth, $report_anomaly, $report_only) = @_;
# go through commits backwards
# we generate two lists of commits to apply
# => ($tip, $breakwater_tip)
@@ -323,6 +327,7 @@ sub walk ($$$;$$$) {
my $st = $cl->{SubType};
$report->($cl);
$found{$ty. ( defined($st) ? "-$st" : '' )}++;
+ push @processed, $cl;
my $p0 = $cl->{Parents}[0]{CommitId};
if ($ty eq 'AddPatches') {
$cur = $p0;
@@ -330,12 +335,10 @@ sub walk ($$$;$$$) {
next;
} elsif ($ty eq 'Packaging') {
push @deb_cl, $cl;
- push @processed, $cl;
$cur = $p0;
next;
} elsif ($ty eq 'Upstream') {
push @ups_cl, $cl;
- push @processed, $cl;
$cur = $p0;
next;
} elsif ($ty eq 'Mixed') {
@@ -407,7 +410,7 @@ sub walk ($$$;$$$) {
workarea_fresh();
- my $rewriting = 1;
+ my $rewriting = 0;
my $build = $basis;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 08:49:31 +0000