summaryrefslogtreecommitdiff
path: root/NOTES.git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-17 11:19:57 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:03:11 +0100
commit7f492dae0db33085a692ece232936313be7b44c1 (patch)
tree98ec4eab4fb15e780aa7f018db61661720c37df3 /NOTES.git-debrebase
parent0ec2b529f2c6579ee279666b079d9b91c393365a (diff)
git-debrebase: NOTES: about divergence and merges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'NOTES.git-debrebase')
-rw-r--r--NOTES.git-debrebase40
1 files changed, 40 insertions, 0 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 2f2b1e8..2fefa91 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -274,3 +274,43 @@ ideally, would make pseudomerge over dgit view
would need to check that dgit view is actually dgit view of
ond of our ancestors
failing that first push will need --overwrite
+
+========================================
+
+divergence, merges:
+
+same problem
+ if merge, look at branches before merge
+ generate new combined branch
+ pseudomerge to overwrite merge
+
+current avaiable strategies:
+
+ maybe launder foreign branch
+
+ if foreign branch is nmuish, can rebase it onto ours
+
+ could merge breakwaters (use analyse to find them)
+ merge breakwaters (assuming same upstream)
+ manually construct new patch queue by inspection of
+ the other two patch queues
+
+ instead of manually constructing patch queue, could use
+ gbp pq export and git merge the patch queues
+ (ie work with interdiffs)
+
+ if upstreams are different and one is ahead
+ simply treat that as "ours" and
+ do the work to import changes from the other
+
+ if upstreams have diverged, can
+ resolve somehow to make new upstream
+ do new-upstream on each branch separately
+ now reduced to previously "solved" problem
+
+ in future, auto patch queue merge algorithm
+ determine next patch to apply
+ there are three versions o..O, l..L, r..R
+ we have already constructed m (previous patch or merged breakwater)
+ try using vector calculus in the implied cube and compute
+ multiple ways to check consistency ?