Maybe some of these operations should automatically edit
debian/changelog.
-
-
-Sean Whitton writes ("Re: Feedback on 3.0 source format problems"):
-> Does the [breakwater] branch contain debian/ alone?
-
-No, it also contains a complete unmodified copy of the upstream code.
-(Except that if upstream had a debian/ directory, it is completely
-replaced.)
-
-For `3.0 (quilt)' the breakwater branch contains roughly what you
-would get if you untarred the origs and the debian.tar.gz, and then
-deleted all the patches without applying them.
-
-
-dgit import handling
---------------------
/ / /
2* 2* 2
/ / /
- 1 1 1 `breakwater' branch, merging baseline
+ 1 1 1 breakwater branch, merging baseline
/ / / unmodified upstream code
---@-----@--A----@--B--C plus debian/ (but no debian/patches)
/ / / no ref refers to this: we
* Maintainer's HEAD was here while they were editing,
before they said they were done, at which point their
tools generated [% and] -/- commit[s] to convert to
- the fast-forwarding interchange branch. (Maybe the
- tooling is simply `dgit push'.)
+ the fast-forwarding interchange branch.
! NMUer's HEAD was here when they said `dgit push'.
Rebase branch launderer turns each ! into an
We want to transform this into:
- I. No new upstream version (0 + 00 eq #)
+=over
+
+=item I. No new upstream version
+ (0 + 00 eq #)
--/--B3!--%--/------D*-------------/-->
/ / /
% 4 4**
/
--#----------------------------------------->
+=item II. New upstream
- II. New upstream (0 + 00 neq #)
+ (0 + 00 neq #)
--/--B3!--%--/------D*-------------/-->
/ / /
/|
0 00
+=back
+
=head1 SEE ALSO
-dgit(1), dgit(7), dgit-maint-*(7)
+git-debrebase(1),
+dgit-maint-rebase(7),
+dgit(1)