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

[Erik de Castro Lopo]

On Sat, 1 May 2004 08:33:10 +0100
Stig Brautaset <address@hidden> wrote:

> 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.

Oh, cool. Thats even better than the config approach.

Erik
-- 
+-----------------------------------------------------------+
  Erik de Castro Lopo  address@hidden (Yes it's valid)
+-----------------------------------------------------------+
"It's far too easy to make fun of Microsoft products, but it takes a
real man to make them work, and a god to make them do anything useful"
  -- Anonymous
-- 
+-----------------------------------------------------------+
  Erik de Castro Lopo  address@hidden (Yes it's valid)
+-----------------------------------------------------------+
"Windows was created to keep stupid people away from UNIX."
  -- Tom Christiansen