Re: [Subclipse-users] Hiding Unchanged Files Within a Branch

On Wed, Feb 20, 2008 at 9:40 AM, Chris Spencer
<cspencer_at_finestationery.com> wrote:

> I'm still somewhat new to SVN, so please let me know if I'm doing anything
> crazy.

Yes, this is crazy :)

> I'm currently working with a very large codebase (roughly a gig) and I
> regularly need to make branches for feature requests and bug fixes. I
> usually only need to change a half-dozen files, so I've gotten in the bad
> habit of only branching the files I need to change.

Ouch!

> The problem is, when I
> try to use Team->Merge to merge these changes back into the main trunk, SVN
> says the two codebases are unrelated, presumably because my branch is
> missing most of the trunk's files.

You can try the --ignore-ancestry setting on merge. It sounds like
you would have to do your merges on a file by file basis though.

> I know SVN branching/tagging is relatively cheap, but with a gig of code
> even a cheap branch takes a long time to create and work with.

No. creating a branch of 1 file and 1 million files takes the same
amount of time and disk space in the repository.

> files may not be duplicated in SVN, but checking out the branch essentially
> duplicates all the files on my local file-system. Is there any way to
> selectively checkout only the files from a branch that differ from the
> trunk, or merge an incomplete branch?

Normally you would use the Switch command to change your working copy
to point to your branch. When you are done you switch back to trunk
and then merge the changes from the branch to trunk and commit.
Switch is very intelligent and efficient.

You can switch specific files and folders, but I would typically
recommend switching the entire project so you do not accidentally
change something on trunk that you meant to change on the branch.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org