Stefan Sperling wrote:
On Tue, May 11, 2010 at 12:06:50PM +0800, Jean Seurin wrote:
Hi Stefan
first of all thanks for spending the time for this long thorough analysis.
1) I want to state that we're using a range of different SVN
clients, cli, Intellij Eclipse, mainly, and some people unde
On Tue, May 11, 2010 at 12:06:50PM +0800, Jean Seurin wrote:
> Hi Stefan
>
> first of all thanks for spending the time for this long thorough analysis.
>
> 1) I want to state that we're using a range of different SVN
> clients, cli, Intellij Eclipse, mainly, and some people under
> Windows may us
On Mon, May 10, 2010 at 07:45:07PM +0800, Jean Seurin wrote:
> Here's the whole thing, minus unconcerned subprojects:
>
> Properties on '$REPO/trunk/project/src/test/resources/log4j.properties':
> svn:mergeinfo
> /branches/project-1.10/src/test/resources/log4j.properties:2344-2345,2347,2349,2351
Here's the whole thing, minus unconcerned subprojects:
Properties on '$REPO/trunk/project/src/test/resources/log4j.properties':
svn:mergeinfo
/branches/project-1.10/src/test/resources/log4j.properties:2344-2345,2347,2349,2351,2361,2363,2405
/branches/project-1.13/src/test/resources/lo
On Mon, May 10, 2010 at 12:08:15PM +0800, Jean Seurin wrote:
> Hi Stefan,
>
> mergeinfo properties are exactly as I mention for the file causing problems:
>
> all and only the 5 files concerned with the problem have been
> commited after a merge from the trunk, empty of modification, but
> with t
Hi Stefan,
mergeinfo properties are exactly as I mention for the file causing problems:
all and only the 5 files concerned with the problem have been commited
after a merge from the trunk, empty of modification, but with the
mergeinfo properties modified as follow:
added line
/branches/projec
On Fri, May 07, 2010 at 02:16:20PM +0200, Stefan Sperling wrote:
> On Fri, May 07, 2010 at 11:35:16AM +0800, Jean Seurin wrote:
> > Hi Stefan,
> >
> > unfortunately even with a fresh branch check out, it would not pick
> > up the missing changes, that is the problem.
>
> Can you try to find out w
On Fri, May 07, 2010 at 11:35:16AM +0800, Jean Seurin wrote:
> Hi Stefan,
>
> unfortunately even with a fresh branch check out, it would not pick
> up the missing changes, that is the problem.
Can you try to find out why it would merge the remaining changes?
I don't think anyone can help you deb
Hi Stefan,
unfortunately even with a fresh branch check out, it would not pick up
the missing changes, that is the problem.
All our WC are at infinity by default, if I'm not mistaken, since we
don't use sparse directories. So this can't have been the source of the
error.
cheers
Jean
Stefan
On Thu, May 06, 2010 at 01:36:04PM +0200, Stefan Sperling wrote:
> You want mergeinfo like this:
>
> /branch (svn:mergeinfo = trunk:r50)
Oh, and I'm not implying that you should modify the mergeinfo by hand.
Just do the merge from trunk to the branch again, but with a working
copy at depth infi
I mean 3 times doing a
svn merge ^/trunk/project
on the feature branch and then commit.
So each time commiting some modifications coming from the trunk,
everything went well.
I checked sparse dir doc, I understand it. I've run the same reintegrate
command on freshly checked out working copy,
On Thu, May 06, 2010 at 06:18:07PM +0800, Jean Seurin wrote:
> Hi,
>
> I just persuaded my organisation to give a try to Feature Branch.
>
> After 3 merges only,
What 3 merges precisely?
> when I attempt to --dry-run a merge
> --reintegrate I've got the following error:
>
> svn merge --reinteg
Hi Stefan,
it actually does not appear in mergeinfo.
thanks
Jean
On Thu, May 6, 2010 at 7:11 PM, Stefan Sperling wrote:
> On Thu, May 06, 2010 at 06:49:51PM +0800, Jean Seurin wrote:
> > added line
> > /branches/project-1.13/*pathToFile*:6266-6372
>
> A * has special meaning in mergeinfo.
> Do
On Thu, May 06, 2010 at 06:49:51PM +0800, Jean Seurin wrote:
> added line
> /branches/project-1.13/*pathToFile*:6266-6372
A * has special meaning in mergeinfo.
Does the * actually appear in the mergeinfo or not?
Stefan
for those 5 files would do trick?
thanks
Jean
-- Forwarded message --
From: Jean Seurin
Date: Thu, May 6, 2010 at 6:18 PM
Subject: Cannot reintegrate feature branch
To: users@subversion.apache.org
Hi,
I just persuaded my organisation to give a try to Feature Branch.
After 3
Hi,
I just persuaded my organisation to give a try to Feature Branch.
After 3 merges only, when I attempt to --dry-run a merge --reintegrate
I've got the following error:
svn merge --reintegrate ^/branches/project-dev --dry-run
With an OSX 1.6.11 client :
svn: Cannot reintegrate into a work
16 matches
Mail list logo
