>
>
> --
> Ricky Charlet
>
> -Original Message-
> From: Andreas Stieger [mailto:andreas.stie...@gmx.de]
> Sent: Wednesday, May 20, 2015 11:23 PM
> To: Charlet, Ricky
> Cc: users@subversion.apache.org
> Subject: Re: reintegrate merge failing because "can only
step would be to check this in (to branch)? Or to
merge trunk into branch again?
--
Ricky Charlet
-Original Message-
From: Andreas Stieger [mailto:andreas.stie...@gmx.de]
Sent: Thursday, May 21, 2015 9:53 AM
To: Charlet, Ricky
Subject: RE: reintegrate merge failing because "can only
arlet
-Original Message-
From: Andreas Stieger [mailto:andreas.stie...@gmx.de]
Sent: Wednesday, May 20, 2015 11:23 PM
To: Charlet, Ricky
Cc: users@subversion.apache.org
Subject: Re: reintegrate merge failing because "can only be used if revisions
were previously merged", but it&#
You may have explicit subtree merge tracking information which differs from
that on what is normally the root of the working copy and merge operation.
These accumulate on actual merges on subtrees as well as copy operations to
resolve tree conflicts. While it is a valid use case it is more likel
Howdy,
I have a trunk and a feature branch. Time has come (it was long, over a
year) to reintegrate back into trunk. I have subversion 1.8 on both server and
client (though a year ago, we were using 1.6 server and client).
I have recently (like yesterday) merged trunk to branch
Solved!
It turned out to be the way I created the branch. I had taken a copy of
the trunk folder in windows explorer and in the copy done a branch and
switch. It was in this copy that that merge was failing.
I created a brand new folder and did a svn checkout on the branch.
Merge worked beautif
ubject: Re: Merge Failing
On Wed, Jan 12, 2011 at 9:22 PM, SUMNER Andrew
wrote:
> Sorry if anyone gets this twice - I originally mailed to users at subversion
> dot tigris dot org on the advice of somebody, but when I actually went to
> the site it suggested this mailing list.
>
&g
On Wed, Jan 12, 2011 at 9:22 PM, SUMNER Andrew
wrote:
> Sorry if anyone gets this twice – I originally mailed to users at subversion
> dot tigris dot org on the advice of somebody, but when I actually went to
> the site it suggested this mailing list.
>
>
>
> I am attempting to merge the project t
Sorry if anyone gets this twice - I originally mailed to users at
subversion dot tigris dot org on the advice of somebody, but when I
actually went to the site it suggested this mailing list.
I am attempting to merge the project trunk into a branch but after
nearly 10 minutes it fails with the
