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

Re: [merge-tracking]: Release date/version

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-02-26 19:16:31 CET

On 2/26/07, Justin Johnson <justinjohnson@gmail.com> wrote:
> What information is available on what this merge tracking will include?
> Specifically I am wondering if it will track merges on a file by file
> basis, or will it be something like svnmerge.py's top level property
> that tracks previous merges of the entire branch? If it is on a file
> by file basis then users could merge their changes to a handful of
> files, and someone in a merge manager role could still perform the
> merge for the entire branch, which would then skip merges previously
> done on those handful of files.

Docs are on the web site


It is like svnmerge.py, although my understanding is that it should also
handle the case you cite.

Mark Phippard
Received on Mon Feb 26 19:16:47 2007

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