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

Re: Rename tracking for merges

From: Alexey Neyman <stilor_at_att.net>
Date: Wed, 2 May 2012 14:58:22 -0700

Hi Stefan,

Mind a couple of questions from potential user of this feature?

On Tuesday, May 01, 2012 01:02:10 am Stefan Fuhrmann wrote:
> * "continue" from-path[@peg] [ from-rev ] to-path
> Specifies that the merge-relevant change history
> of from-path,from-rev is continued by to-path,
> current rev carrying this revprop. From simplicity,
> from-rev can be the deletion rev but the deletion
> will not become part of the combined history.
> Rationales:
> - Could also be called "link" but that might be
> mistaken for OS file system links.
> - Allow for @peg rev just for consistency with
> other UI
> - From-rev is useful to bridge gaps between the
> rev in which from-path was deleted and the one
> carrying this merge hint.

Does it make sense to have from-path replaced with from-url? 'svn merge'
supports, to some extent, merging changes from another repository, so using
from-url would fall in line with existing 'svn merge' interface.

It would also be useful if other svn commands (such as 'svn log', for example)
could follow these merge hints - similarly like they do with svn:mergeinfo. Is
it planned?

The reason for these questions is, we are currently considering merging two
repositories in our company and the only thing which stops us is the need to
preserve the revision numbers (since they are referenced from other software).

Having the svn:mergehints that could refer to paths in external repository
would solve this problem: we could just import current state of repository B
into repository A, make repository B read-only and have svn:mergehints in
repository A point to repository B for previous history.

Received on 2012-05-02 23:59:01 CEST

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