From: Ian Jackson Date: Mon, 30 Jan 2012 23:31:23 +0000 (+0000) Subject: FORMAT: put deps etc. in base branch where we need them X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=commitdiff_plain;h=3e8d721402b8e907a2658ef86ce9c05756f85c56;hp=47d533722a17175a58abd30d35f4aa36f8e2e3bd FORMAT: put deps etc. in base branch where we need them --- diff --git a/DESIGN b/DESIGN index f3c3f82..0d5215f 100644 --- a/DESIGN +++ b/DESIGN @@ -231,13 +231,13 @@ OK so here is a plan: 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 diff --git a/FORMAT b/FORMAT index 7313ab8..593fede 100644 --- a/FORMAT +++ b/FORMAT @@ -16,9 +16,8 @@ In-tree, there are metadata files in .topbloke deps direct dependencies, one per line as either: - .f - .tg - exist only in tip branch + - + exist only in base branch deleted exists (but empty) if branch is deleted exist only in tip branch @@ -29,7 +28,7 @@ In-tree, there are metadata files in .topbloke topgit- name of the topgit branch that this was imported from and which we should merge from (plus a newline) - exist only in tip branch + exist only in base branch [^+]*- another property that applies to this patch; if not known to this version of topbloke then it