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

Re: BUG: Wrong merge range

From: phahn <pjtr.hahn_at_googlemail.com>
Date: Thu, 25 Sep 2008 14:18:29 -0700 (PDT)

On 25 Sep., 22:09, "Fisher, John" <jfis..._at_forthrightsolutions.com>
wrote:
> First, even if your mental model "is that of subversion", that doesn't
> make it the same as the mental model of common TSVN users.
Ok, so the system has to adopt to the mental model of the user or has
the user to understand the mental model of the system.
Maybe I should go back to school and complain that all me not so good
grades have to be corrected because they don't accounted for my
different mental model?

> Second, I've read the subversion documentation.  Things like, "Notice
> that in general, revisions N and M of a file do not necessarily differ!"
> indicate that the revision numbers don't store files, but something
> else.  
Great! Now we discuss things like "indicate" and "something else".

The documentation clearly says:
"Each revision number has a filesystem tree hanging below it, and each
tree is a “snapshot” of the way the repository looked after a commit."

Just look into a .svn/text-base dir and you will see the version of
your files at your working copy revisions. You won't see a diff here
but a complete file.

So you can't apply a revision to anything because you can't apply a
file you just can apply differences / changes between files.
Merging revisions in the sense of the word is just not possible.
Therefor the list shouldn't start with the first revision you want to
merge but with the revision of the file before the change you made to
it and now want to merge back into your trunk.

Revisions N and M of a file do not necessarily differ because
subversion uses global revision numbers and if the file didn't changed
between two revisions there is no difference.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-09-25 23:18:44 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.