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

Keyword expansion from merged changes

From: James Hanley <jhanley_at_dgtlrift.com>
Date: Thu, 2 Jan 2014 22:16:24 -0500

I've used the Rev keyword in some of our code, and we noticed that there
may be a use case gap for the Rev/Revision and possibly Id keyword.

As expected the keyword gets updated with any checkin, but there may be a
need to have a merge-history aware version these keywords. Meaning that
the Rev shown from a merge isn't the actual checkin of the merge, but the
change origin of the merge.

So the use case would be branching a project P from the trunk to do some
work, them merging those changes back. In its current form, the rev takes
the revision of the merged checkin rather then the origin of the merged

We see a need for this capability of having a merge-history aware keyword,
and one way to accomplish this without adding yet another keyword would be
to have the existing keywords support some kind of argument like options.

For example, when setting for the Rev keyword (as it works right now),
simply set
for the property svn:keywords, but if the user really wanted Rev to
indicate the delta origin of the rev they would use
or perhaps
rev -g
in the svn:keyword entry...

The disadvantage with this meathod vs creating either new svn keywords or
having the options embedded directly in the keyword referenced within the
file is that you cannot have two different revs in the same file.

Fuel for though?
Received on 2014-01-03 04:17:08 CET

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.