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

RE: Merging confuses renamed files

From: Sander Striker <striker_at_apache.org>
Date: 2003-08-22 23:30:35 CEST

> From: John Goerzen [mailto:jgoerzen@complete.org]
> Sent: Friday, August 22, 2003 10:11 PM

[...]
> I'm also saying "I *think* it could do this fairly trivially."

It's a hairy issue. Far from trivial.
 
>> I'm saying "it doesn't do this." I think you agree with that
>> ... that's what got you started!
>
> Indeed.
>
>> If the question is "why doesn't it do this?" then the answer is
>> "because it was not a design goal." Put another way, SVN is trying to
>> replace CVS, not Bitkeeper.
>
> I think that's a cop-out. To me, if merging destroys custom changes
> that should not be, with no warning, that is a bug.

To put Jacks words into other terms: at this point we have no one looking
into the fancy merging features. These are all post 1.0. Unless the
resources come along (read: volunteers) that work on merging, this isn't
going to happen anytime soon, certainly not pre 1.0.

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 22 23:31:35 2003

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

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