What if you do a commit from the root directory (which is what I was
imagining)? Then it is keeping track of multiple local paths that map to
multiple remote paths, and needs to deal with the entire situation in the
one command. I started thinking about it, and it started giving me a
headache:
Let's say that I made local modifications to the original blue branch.
During the commit, does it notice that the two don't match anymore and yell
at me? Or, does it commit the changes, and _not_ bump the revision on the
disjoint copy. Or, does it merge those changes into the disjoint copy. In
both of those cases, what if there are also changes in the disjoint, and
what if those changes _conflict_ with the changes from the original?
I figure that however this is handled would need to be consistant with
however server-side links work when (hopefully not if, I use these in CVS a
lot...) they get implemented, as they would generate the same usage pattern.
Sincerely,
Jay Freeman (saurik)
saurik@saurik.com
----- Original Message -----
From: "Garrett Rooney" <rooneg@electricjellyfish.net>
To: <cmpilato@collab.net>
Cc: "Jay Freeman (saurik)" <saurik@saurik.com>; "svn-dev List"
<dev@subversion.tigris.org>
Sent: Thursday, January 24, 2002 2:33 PM
Subject: Re: M&S - Disjoint Duplicates
> On Wed, Jan 23, 2002 at 02:25:49PM -0600, cmpilato@collab.net wrote:
> > "Jay Freeman \(saurik\)" <saurik@saurik.com> writes:
> >
> > > Oh, "when an update is performed" should be "when a commit is
performed".
> >
> > Heh. That is a bit different. And I have no idea what the answer
> > should be.
>
> off the top of my head, i'd say that changes in one dir that are
> committed would propogate to the other upon the next update,
> potentially conflicting of course.
>
> if there were changes in both dirs that conflict with each other, then
> the commit should (i imagine) fail...
>
> -garrett
>
> --
> garrett rooney Unix was not designed to stop you from
> rooneg@electricjellyfish.net doing stupid things, because that would
> http://electricjellyfish.net/ stop you from doing clever things.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:59 2006