From b87752b722a779d961ddb162ea428d97649121d5 Mon Sep 17 00:00:00 2001 From: Stefan Sperling Date: Sun, 3 Oct 2021 22:07:59 +0000 Subject: [PATCH] update 'got merge' TODO item --- TODO | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/TODO b/TODO index 57240a34..cb4ecc3c 100644 --- a/TODO +++ b/TODO @@ -1,10 +1,7 @@ got: -- Add support for creating merge commits. This should move the work tree - onto a temporary branch like rebase and histedit do, recording commit - IDs and such in refs/got/merge/ as needed to keep state. - Bonus points for being able to merge an arbitrary tree into an arbitrary - subdirectory of the work tree. This would be required for merging vendor - branches. Say you have a branch 'llvm-12' which intially contains a 12.0 +- Teach 'got merge' to merge changes into an arbitrary subdirectory + of the work tree. This would be nice for merging vendor branches. + Say you have a branch 'llvm-12' which intially contains a 12.0 release tree as published by the LLVM project, added to the repository with a command such as 'got import -b llvm-12'. On the main branch we would want to merge files from the llvm-12 branch into /usr/src/gnu/llvm -- 2.11.4.GIT