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

Re: Version tree

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-07-25 03:30:19 CEST

Branko Čibej <brane@xbc.nu> writes:

> Marcus Comstedt wrote:

> >* For the round "version" nodes: Which revisions in which the file
> > has changed (easy).
> >
> >* For the square "branch" nodes: Which revisions of the file that
> > have been copied/moved to other pathnames (and which those pathnames
> > are). This seems to be more difficult. There is a "copyfrom_path"
> > and a "copyfrom_rev" attribute in the log that gives the necessary
> > info, although it points the wrong way. That can be fixed by
> > requesting the entire log and reversing the links yourself of
> > course. What's worse is that these attributes only seems to be
> > added for moves, not for copies. Is that correct?
> All of this information is available in the repsitory. Our new schema
> was designed (in part) with exactly such functionality in mind. You'd
> need some help from the server to get the required data, but it's be
> much faster (and more accurate) than parsing the logs.

By the way, Marcus: there's no difference between a move and a copy; in
Subversion's eyes, a 'move' == 'copy + rm'. So whenever you run 'svn
log -v' and see something about a copy, it could be a move or a copy.

> >* For the red "merge" arcs: Which revisions of the file that have
> >been merged into another path, and what path and revision it has
> >been merged with. Does svn merge record any relationship between
> >the two merged files at all?
> >
> Not yet. Poat-1.0. Unfortunately.

Right. This is the infamous 'repeated merge' problem that CVS
suffers, and is discussed in the subversion Design document. We'll
probably end up solving this problem by using properties. That is,
whenever you run 'svn merge', the files which get patched also get
some kind of information added to special "merge properties". From
then on, Subversion looks at these props to "remember" which changes
were merged on each file.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 25 03:31:51 2002

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.