[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnu-arch-users] Re: Two branches, slightly different set of files

From: Stig Brautaset
Subject: [Gnu-arch-users] Re: Two branches, slightly different set of files
Date: Sat, 1 May 2004 08:33:10 +0100
User-agent: Mutt/1.3.28i

On May 01 2004, Erik wrote:
> I have used branches successfully before, but never had a branch
> where there are files that only exist in one branch. Does anyone
> have experience of this? How is it likely to work?

It works fine. Just tag into a new branch and delete the files you don't
want showing up there. Then do a sync-tree from the other branch. After
this you can star-merge between the trees without the deleted files
showing up in the public branch. When you merge in patches that touch
the "secret" files arch will leave directories around with the patches
it didn't manage to apply because the files were missing.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]