Re: M&S - Disjoint Duplicates

On Thu, Jan 24, 2002 at 02:37:53PM -0600, Jay Freeman (saurik) wrote:
> 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:

oh, i never said it was going to be easy to implement ;-)

> 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?

it seems like we'll have to find out if the changes conflict before
they could be committed, if we're going to allow this kind of thing.

and yes, it gives me a headache as well...

-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