At 10:48 AM -0500 8/22/03, Ben Collins-Sussman wrote:
>cmpilato@collab.net writes:
>
>> John Goerzen <jgoerzen@complete.org> writes:
>>
>> > My question is: why? Subversion has enough information to duplicate
>> > the upstream changes locally, but doesn't. It appears to be behaving
>> > as if --ignore-ancestry was given to merge, but it wasn't.
>> >
>> > Can anybody shed some light on this?
>>
>> Um ... Ben and I, kinda, made --ignore-ancestry the default. It's now
>> --notice-ancestry. But the other day, Ben started having second
>> thoughts, and now I am, too. Should this be reverted?
>
>Here's my thoughts, which I think cmpilato now agrees with:
Is this relevant to the original question?
At 10:33 AM -0500 8/22/03, John Goerzen wrote:
>Consider this example. We have Bob maintaining the main tree for
>package foobar, and his repository is at http://foo.com/somewhere. He
>maintains foo.py.
>
>Alice has her own repository for foo.py, which contains a couple of
>small changes.
"His repository." "Her repository." Are you really talking about
two separate repositories, John? Your examples are all from Sue's
perspective, and refer to "her repository" only as ".". But if you
really mean that she has a separate repository, then it must be named
something like "http://foo.com/elsewhere", right?
In that case, I think the answer to your question is "Subversion does
not maintain history between repositories." The fact that Sue's
foo.py once came from Bob's is not recorded; the merge only knows
that Bob has a "bar.py," and Sue does not.
--
-==-
Jack Repenning
CollabNet, Inc.
8000 Marina Boulevard, Suite 600
Brisbane, California 94005
o: 650.228.2562
c: 408.835-8090
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 22 19:57:47 2003