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

Re: tree conflict info

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 13 Aug 2009 15:18:52 +0100

On Thu, Aug 13, 2009 at 01:49:09PM +0100, Julian Foad wrote:
> Neels Janosch Hofmeyr wrote:
> > There won't ever be a different repository's URL in there, will there.
> In a cross-repository merge? But I don't think we need to handle that at
> the moment, do we?

Didn't CMike do extra work to make merges from arbitrary URLs work?

r29742 | cmpilato | 2008-03-06 14:58:07 +0000 (Thu, 06 Mar 2008) | 17 lines

Enhance (complete?) our existing support for merges from foreign
repositories by treating merged adds of files and directories as
regular adds (instead of adds with history).

* subversion/libsvn_client/merge.c
  (merge_file_added, merge_dir_added): Don't calculate copyfrom
    information for merged adds when the merge source repository is
    not the same repository as the one from which the merge target
    working copy was checked out.

ALSO (accidentally committed):

* contrib/client-side/svnmerge/svnmerge-migrate-history.py
  Begin trying to deal with the differences between svnmerge's
  property syntax and Subversion's svn:mergeinfo syntax.
  (### This bit reverted in r29743. ###)


I'd say we should only shorten URLs in svn info output to ^ if the URL
matches the repository root recorded for the item.


Received on 2009-08-13 16:19:49 CEST

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.