On Monday 10 October 2005 14:35, Robert P. J. Day wrote:
> On Mon, 10 Oct 2005, charles i wrote:
> > Yes - merging directories (in a repository) into one
> > in my working copy is what I am looking for.
> >
> > Is there any reason why Subversion doesn't support
> > this? Are there any (other) work arounds?
>
> but how would you define the semantics of such a merge? including how
> you would commit changes back again? are you suggesting subversion
> should keep track of which of the two directories each file in the
> "merged" working copy came from?
>
> i don't think you appreciate the difficulty of what you're asking for.
Well, I plan to write such a merge for fsvs.
I'm planning to have a stack of URLs from which to update, and each file is
taken from the "highest" URL where it exists.
Changes in a file will be committed to the highest URL.
So it should be possible to "overlay" an URL on a machine, do some work, and
checkin all differing files into that URL.
(Yes, that's the easy road. What is wanted above means that svn will have to
track where a file came from - but that's just a kind of marker pointing to
the right base-url, isn't it?)
Or am I wrong? Don't I see something which makes that impossible?
Regards,
Phil
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 10 15:13:48 2005