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

Re: SVN 1.5 cleared for takeoff

From: Marc Strapetz <marc.strapetz_at_syntevo.com>
Date: Wed, 28 May 2008 19:47:35 +0200

> It's possible that your understanding of this bug is deeper than mine.
> Would you be willing to try writing that text... ?

I will gladly formulate the problem, but regarding the resolution I'm
also not sure -- maybe someone with more insight into merge-tracking can
comment on the description below, assuming following repository:

- trunk created from initial import at r1
- trunk/file modified at r2
- branches created at r3
- branches/branch created at r4 (from trunk at r2)
- branches/branch/file modified at r5
- branches/branch/file modified at r6

A merge from branch to trunk currently results in an svn:mergeinfo of:

/branches/branch:4-6
/trunk:2-3

"/trunk:2-3" is a self-referential mergeinfo which should (and for 1.5.1
actually will) be omitted. So the correct svn:mergeinfo would just be:

/branches/branch:4-6

This can either be achieved by "reverse merging" the trunk changes with
--record-only or -- more brute force -- by manually editing the
svn:mergeinfo property.

So for this very basic case, is this actually the manual fix for issue
#3157?

--
Best regards,
Marc Strapetz
_____________
SyntEvo GmbH
www.syntevo.com
Karl Fogel wrote:
> Marc Strapetz <marc.strapetz_at_syntevo.com> writes:
>>> We should mention this problem in the Release Notes, of course, and say
>>> that it will be fixed in 1.5.1.
>> It would be helpful here to give some additional information on how it
>> would be right (i.e. how it will be changed for 1.5.1) so that fussy
>> people like me can fix it manually when committing a merged revision
>> :)
> 
> It's possible that your understanding of this bug is deeper than mine.
> Would you be willing to try writing that text... ?  If you can, I'll
> make sure it gets into the Release Notes, or into some document linked
> to from the appropriate place in the Release Notes.
> 
> -Karl
> 
> 
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-28 19:47:55 CEST

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