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 p
nk/project/src/test/java/com/company/client/project/dossierstagiaire/persistence/DossierStagiaireDaoHibernateTest.java:6336-6389
branches/project-dev/src/test/resources/log4j.properties
Missing ranges:
/trunk/project/src/test/resources/log4j.properties:6336-6389
Jean
Stefan Sperling wrote:
On Mon, May 10, 2010 a
trunk as part of the same merge from
the Release branch didn't get their mergeinfo updated.
cheers
jean
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 ch
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
nk to Feature Branch afterward.
Investigating...
Thanks for your deep explanation of the shallow copies ;)
Jean
Stefan Sperling wrote:
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
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
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
That's more like what we do :)
Actually I was just troubled with the merge possibilities. I've started
to use the merge function recently, and at the same time discovered the
--reintegrate option with the feature branches.
I though maybe there could be something equivalent for release branches
Hi,
we have a problem we can't solve yet with Subversion.
In our process, we create a branch of a version that is going to be
released. Then we release from that branch and create a tag for each
released version.
The problem lies in the bug fix of this released version. We have to
apply manu
10 matches
Mail list logo
