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

RE: Merging or moving from "trunk" to a branch.

From: Dale Worley <dworley_at_pingtel.com>
Date: 2005-02-22 22:17:14 CET

> I don't see how moving a file with a revision associated to it to
> another branch violates *core* principles? The revision hasn't
> changed. As a matter of fact, I DON'T want the revision number on the
> file to change.

Files don't have revision numbers. A "revision" is a *state of the source
tree*. Every change you make to the source tree necessarily creates a new
revision.

For a given file, you can speak of "the contents of the file x/y/zzz as
committed in revision 124 and continuing unchanged through revision 131, and
replaced by a new version of the file in revision 132".

When you copy "file x/y/zzz as in revision 124 into branch/y/zzz", you are
creating revision 133 of the database, and branch/y/zzz in rev. 133 is the
same as x/y/zzz in revs. 124 through 131.

See, for example,
http://svnbook.red-bean.com/en/1.0/apa.html#svn-ap-a-sect-1

Dale

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 22 22:22:35 2005

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

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