Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: tree conflict info

subversion
Discussion topic

Back to topic list

Re: tree conflict info

Author stsp
Full name Stefan Sperling
Date 2009-08-13 07:19:31 PDT
Message 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_cl​ient/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-mi​grate-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.

Stefan

« Previous message in topic | 3 of 7 | Next message in topic »

Messages

Show all messages in topic

tree conflict info neels Neels Janosch Hofmeyr 2009-08-12 19:32:09 PDT
     Re: tree conflict info julianfoad Julian Foad 2009-08-13 05:49:15 PDT
         Re: tree conflict info stsp Stefan Sperling 2009-08-13 07:19:31 PDT
             Re: tree conflict info markphip Mark Phippard 2009-08-13 07:21:32 PDT
                 Re: tree conflict info cmpilato C. Michael Pilato 2009-08-13 07:46:41 PDT
                 Re: tree conflict info stsp Stefan Sperling 2009-08-13 08:24:12 PDT
                     Re: tree conflict info neels Neels Janosch Hofmeyr 2009-08-14 13:00:45 PDT
Messages per page: