Re: Merging confuses renamed files

On Saturday, August 23, 2003, at 04:26 AM, Ben Collins-Sussman wrote:

> Jack Repenning <jrepenning@collab.net> writes:
>
>> Leaving aside my doubts as to whether this is actually relevant to
>> John's original question, yeah, I think I object. I'm very
>> uncomfortable with the rationale you propose. Not the least of my
>> discomfort is, I can't for the life of me figure out what your "when
>> you do this, you do or don't care" ideas imply about what (you think)
>> I expect to see on screen!
>
> Jack, I'm not making up "what users expect" on a whim. My proposal is
> based on real feedback from users... although understandably, you've
> not been on this list long enough to be aware of this feedback.

I'm a user who has been on the list a while, and thought about this a
bit, and I think I'd rather have diff honour ancestry -- I view diff as
a dry-run of merge and if merge is going to delete and re-add lots of
lines, then I want to know that.

That still leaves the problem of what happens when you diff unrelated
files. Well, if the files are related, then use ancestry, otherwise
print a "warning: unrelated files" and ignore ancestry. But what I
really want is a way to edit ancestry easily!

If I use diff, and get lots of warnings about unrelated files, then I'd
like to be able to tell svn, "look, I know the person who added this
file didn't follow your rules, but just treat these two files as
related please." (My very vague knowledge of the svn schema suggests
something about adding a line to a copies table to turn the original
add into an add with history? I'm not sure how the copy table and node
id's relate here.)

Interestingly, this has come up before:
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=35541

later,

Will :-}

--
Dr William Uther                            National ICT Australia
Phone: +61 2 9385 6926             School of Computer Science and 
Engineering
Email: willu@cse.unsw.edu.au             University of New South Wales
Jabber: willu@jabber.cse.unsw.edu.au          Sydney, Australia
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org