Find the (latest) common ancestor.
- Check for unwanted dependency removals.
+ Check for unwanted dependency removals.
An unwanted dependency removal is
A branch in the desired included deps
Which exists in the common ancestor's actual included deps
stops us looking into the hitory of non-topbloke-controlled
branches). This can be done with git-rev-list
--remove-empty.
+ * It also stops at any point where we meet a commit which
+ does have the dep in the actual included deps. We have
+ to do this by hand.
* The the relevant unwanted removal commit for that dep is
the most recent unwanted removal commit, as defined.
Select the unwantedly removed dep whose relevant unwanted
from the source.
iii.
+ Check whether our list of dependencies has changed. If so
+ we need to restart the whole base update.
+
+ iv.
Check for missing or unwanted dependency inclusions. Compare
our base's desired included deps with our base's actual
included deps. In exceptional conditions, they will not
The "best order" for merges is in order of recency of common
ancestor, most recent first, and if that does not distinguish,
merging from local branches first.
-
+
"Recency" refers to the order from git-rev-list --date-order.
Actual included deps:
Check for merge success in the index and compare to exit status
from git-merge (which is 1 if the merge failed).
Adjust the metadata.
- Print appropriate big fat warnings if we have merge conflicts in our
+ Print appropriate big fat warnings if we have merge conflicts in our
metadata.
Commit, adjusting the parents of the new commit to the original
parents if we made the merge with special massaged parents.
Strategies for each metadata file merge:
- in base/tip same patch's tip dep -> base base -> tip
+ in base/tip same patch & branch dep -> base base -> tip
msg T textual merge rm from src not in src
- deps T list merge rm from src not in src
+ deps B list merge rm from src rm from src
deleted T std existence merge rm from src not in src
patch- BT must be same rm from src must be same
- topgit- T must be same rm from src not in src
+ topgit- B std exist/text merge rm from src rm from src
[^+]*- ?? textual merge rm from src rm from src
+included BT list merge rm from non-tb src list merge
+*- ?? textual merge rm from non-tb src textual merge
*[^-] ?? die, aborting all ops, if found in any tb src or branch
+
+
+
+
+
+Unwanted removal search subgraphs:
+
+ rm relevant removal
+ inc
+
+ rm impossible to undo removal, arrgh, terminates search
+inc inc..
+/ ??? \
+
+ rm
+inc.. rm.. merge of a removal, search down the rm path
+/ [inc] \
+
+ inc ??? call it an inclusion, terminate the search
+ rm
+
+ inc merge of an inclusion, terminates search
+inc.. rm..
+/ [rm] \
+
+ inc ??? call it an inclusion, terminate search
+rm.. rm..
+/ ??? \
+
+
+ rm inc inc rm irrelevant
+ rm inc inc inc.. rm rm..
+
+
+
+ proposed (elsewhere)
+ / \ | |
+ / \ | |
+ / | | |
+ REMOVAL rm | | |
+ | | | |
+ inc | | |
+ / | | | |
+ / inc | | |
+ | | `------------ | ----<-------- | -.|
+ inc inc | | *2
+ |`- | ------------- | ----<--------.| |
+ `---inc | 1* /
+ | | | /
+ RE-INCLUDE inc rm REMOVAL |'
+ \ | / |
+ * REMOVAL rm / |
+ | inc |
+ inc / |
+ | / |
+ inc / |
+ | /`--------<-----------.|
+ inc / |
+ | / |
+ RE-INCLUDE inc / |
+ \ | / |
+ * REMOVAL rm / |
+ | / |
+ inc |
+ \ |
+ `------------<-------------.|
+ |
+ |
+ IT
+
+
+ Merge 1* and 2*, diff against some relevant base branch commit
+ or something, and apply to proposed.
~ian / topbloke.git / blobdiff