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

[Cameron Patrick]

Erik de Castro Lopo wrote:

| This can be got around by adding an empty file to the private branch
| merging to the public branch, then deleting from the public branch
| before adding any content to the new file in the private branch.

Actually you shouldn't even need to do that.  Just remove the file
after you star-merge and before you commit and it will never find its
way to the public branch.  e.g.

        [in private branch]
        $ tla add sekr1t-file
        $ tla commit

        [in public branch]
        $ tla star-merge stuff--private--42
        $ tla rm sekr1t-file
        $ tla commit

Cheers,

Cameron.