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

Re: peg revision / svn_client_merge_peg ?

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2004-09-10 17:44:01 CEST

On Fri, 2004-09-10 at 11:33, Martin Hauner wrote:
> 1) what exactly is a peg revision?

Because we support directory versioning, it can sometimes be a little
tricky to identify what you're talking about. If I tell you I want to
merge http://foo/bar/baz from rev 1000 to rev 2000 into the current
working dir, which /foo/bar/baz am I talking about? The pah bar/baz
might identify three different objects at rev 1000, rev 2000, and the
head revision.

The peg revision nails down which file or directory I'm talking about,
without affecting the operative range of the merge. So if revision1 is
1000 and revision2 is 2000 and peg_revision is 3000, then we look up the
object bar/baz as of revision 3000 and merge the changes it experienced
between revs 1000 and 2000.

> 2) from an svn client perspective is there any need to support both
> merge methods? Is there another use case to have two source
> paths in svn_client_merge apart from handling renames?

If I want to merge the changes between two tags, or between a branch and
a trunk, I'll want to specify two paths.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 10 17:44:48 2004

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.