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

Re: svn merge and svnmerge - quick question.

From: Johan Corveleyn <jcorvel_at_gmail.com>
Date: Mon, 22 Apr 2013 21:20:00 +0200

On Mon, Apr 22, 2013 at 5:11 AM, Z W <mpc8250_at_gmail.com> wrote:
> Hi All
>
> We have 1.6 SVN.
>
> Can svnmerge.py and svn merge be used on the same working copy directory for
> merging from trunk to branch ?

I have no experience with svnmerge.py, but I wouldn't really recommend
it. AFAIU they will not know about each other's merging, so they won't
know what has already been merged by the other tool and what not.

But if you don't really care about this "cross-tool merge tracking", I
suppose it can work. 

--
Johan
Received on 2013-04-22 21:20:51 CEST

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.