[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: newbie: confused abt merging checkouts w/ co, up, sw ...

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-01-11 22:08:23 CET

On Sun, 2004-01-11 at 14:30, OpenMacNews wrote:

> fair enuf ... but once i've done the 'svn mv' locally, and make any changes to now-merged file collections in "apples/"
> and "oranges/" (per my earlier example ...) when I commit, WHAT am I committing back INTO? the SEPARATE dirs (e.g.,
> .../apples/ and .../dev_apples/? or, now, everything back into "just" .../apples/)?

What you're trying to do is pretty awkward, and not possible in
Subversion. There's no way for a working-copy directory tor eflect the
"union" of two repository directories.

You can use 'svn switch' to make sub-trees of your working copy map to
specific sub-trees in the repository, but that's just a simple tree
rearrangement. The most common case for that is, "please switch this
subdirectory here to a branch."

But that's as far as the idea goes. You can mix and match repository
subtrees, but not the *contents* of directories. Moving files doesn't
work. You don't want to move files; that would imply moving them in
the repository once you do a commit, and you certainly don't want things
to move around in the repository.

I think you need to explain your rationale... what problem are you
trying to solve, and how does laying out your repository in a certain
way (and wanting the "union" feature) help you solve the problem?
Chances are, there's probably a much simpler solution.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 11 22:09:13 2004

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.