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

Re: Some sync merges no more allowed with 1.8 client ?

From: Branko Čibej <brane_at_wandisco.com>
Date: Sat, 06 Jul 2013 00:12:34 +0200

On 05.07.2013 19:28, Eric Estievenart wrote:
> Of course the layout of the repository is historical and a bit complex;
> I'll try to represent it here: (hoping you have a fixed font...)
>
>
> /app/v2-dev /------------------
> /app/v2-candidate /---/-------------------
> /app/v2-stable /---/------------------------
> /v2 /------/ (no more used)
> /app/v3-dev / /---------------------
> /app/v3-candidate / /---/----------------------
> /app/v3-stable / /--/---------------------------
> / /
> /app/trunk / /-----/--------------------------------
> /trunk ---/--/ (no more used)
> (largely eluded: less versions, no feature branches, etc.)
>
> The sync merges which no more works are like:
> /app/v2-dev => /app/v3-dev
>
> As you can see, none is a direct ancestor of the other, but they share
> a common one: /trunk (despite renamed as /app/trunk).
> And this has been working perfectly with 1.7 for months, so we'd like to keep
> she same process once we upgrade both the server and the clients to 1.8.

Can you confirm that all the branches created by copying (svn copy) from
the source, as you've described in this diagram?

How were the /app/trunk and /app/v2-stable branches created? Are they
just renamed /trunk and /v2?

-- Brane

-- 
Branko Čibej | Director of Subversion
WANdisco // Non-Stop Data
e. brane_at_wandisco.com
Received on 2013-07-06 00:13:08 CEST

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