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

Re: Merging question

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-06-26 18:24:35 CEST

cmpilato@collab.net writes:

> IIRC, this happens when the server tells the client, "I have a
> different node at this path than you do", but there are no textual or
> property differences between the two nodes. The lack of status code
> indicates that after the merge is done, there are no noticeable
> changes to the file (not even anything merged in).

Hm, I guess that makes sense, but I don't understand why it would be
useful to display to the user. Why would a user care about whether
the nodes are identical? The user is just trying to generate a patch
("port a changeset"). Either a file gets patched, or it doesn't.
It's not about node identities.

This seems (to me) like an implementation detail unnecessarily exposed
to users, only increasing confusion. Can someone give a use-case or
rationale for this?

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 26 20:26:43 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.