chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase(5): Corrections and clarifications to dgit import
[dgit.git]
/
git-debrebase.5.pod
diff --git
a/git-debrebase.5.pod
b/git-debrebase.5.pod
index 26e4813f72eadb879c5280a626f6d66829eb89aa..af9b91a03989d31e8c6dad64261686b3f73f9927 100644
(file)
--- a/
git-debrebase.5.pod
+++ b/
git-debrebase.5.pod
@@
-518,9
+518,14
@@
when git-debrebase rewrites the commit.
=head1 APPENDIX - DGIT IMPORT HANDLING
=head1 APPENDIX - DGIT IMPORT HANDLING
+The dgit .dsc import format is not documented or specified
+(so some of the following terms are not defined anywhere).
+The dgit import format it is defined by the implementation in dgit,
+of which git-debrebase has special knowledge.
+
Consider a non-dgit NMU followed by a dgit NMU:
Consider a non-dgit NMU followed by a dgit NMU:
- interchange --/--B3!--%--/----D*-->
+ interchange --/--B3!--%--/
/
----D*-->
/ /
% 4
/ 3
/ /
% 4
/ 3
@@
-531,21
+536,22
@@
Consider a non-dgit NMU followed by a dgit NMU:
1 0 00 =XBC%
/
/
1 0 00 =XBC%
/
/
-
--@--A breakwater
- /
- --#--------> upstream
+ --@--A breakwater
+
/
+
--#--------> upstream
Supplementary key:
=XBC% dgit tarball import of .debian.tar.gz containing
Supplementary key:
=XBC% dgit tarball import of .debian.tar.gz containing
- Debian packaging including changes B C and quilt patches
-
+ Debian packaging including changes B C and quilt patches
0 dgit tarball import of upstream tarball
0 dgit tarball import of upstream tarball
- 00 dgit tarball import of supplementary upstream tarball
- &_ dgit nearly-breakwater import
+ 00 dgit tarball import of supplementary upstream piece
+ &_ dgit import nearly-breakwater-anchor
+ // dgit fetch / import-dsc pseudomerge to make fast forward
+
&' git-debrebase converted import (upstream files only)
&' git-debrebase converted import (upstream files only)
-
D' git-debrebase converted debian/ changes
import
+
C' git-debrebase converted packaging change
import
* ** before and after HEAD
* ** before and after HEAD
@@
-556,43
+562,43
@@
We want to transform this into:
=item I. No new upstream version
(0 + 00 eq #)
=item I. No new upstream version
(0 + 00 eq #)
- --/--B3!--%--/
-
-----D*-------------/-->
- / / /
- % 4 4**
- / 3 3
- / 2 2
- / 1 1
- 2 &_ /
- / /| \ /
+ --/--B3!--%--/
/
-----D*-------------/-->
+ / /
/
+ % 4
4**
+ / 3
3
+ / 2
2
+ / 1
1
+ 2 &_
/
+ / /| \
/
1 0 00 =XBC% /
1 0 00 =XBC% /
- /
/
- /
/
-
--@--A-----B-----------------------C
--D
- /
- --#----------------------------------------->
+ / /
+ / /
+
--@--A-----B---------------------C'-
--D
+
/
+
--#----------------------------------------->
=item II. New upstream
(0 + 00 neq #)
=item II. New upstream
(0 + 00 neq #)
- --/--B3!--%--/
-
-----D*-------------/-->
- / / /
- % 4 4**
- / 3 3
- / 2 2
- / 1 1
- 2 &_ /
- / /| \ /
+ --/--B3!--%--/
/
-----D*-------------/-->
+ / /
/
+ % 4
4**
+ / 3
3
+ / 2
2
+ / 1
1
+ 2 &_
/
+ / /| \
/
1 0 00 =XBC% /
1 0 00 =XBC% /
- / /
- / /
-
--@--A-----B--------------------@--C
--D
-
/
/
-
--#----------------------- - - / - -
----->
-
/
-
&'
-
/|
-
0 00
+ /
/
+ /
/
+
--@--A-----B-----------------@---C'-
--D
+
/
/
+
--#--------------------- - - / - - ----
----->
+ /
+ &'
+ /|
+ 0 00
=back
=back
~ianmdlvl / dgit.git / blobdiff