fixed: regression in mergeinfo-aware merges against 1.5.3

[Silver Zachara <si...@gmail.com>]

Hi all,

I readed changelog for Subversion 1.5.4 and I want to ask You what does
it mean this fix:
* fixed: regression in mergeinfo-aware merges against 1.5.3

Where was a problem and how did you indicate it ?

Can You send me some info or link ?

-- 
-------------------------------------------------------------------
                      --== Silver Zachara ==--
- pgp - http://radeonvmod.ic.cz/keys/silver.zachara@gmail.com.asc -

Re: fixed: regression in mergeinfo-aware merges against 1.5.3

[eg <eg...@gmail.com>]

Silver Zachara wrote:
> Hi all,
> 
> I readed changelog for Subversion 1.5.4 and I want to ask You what does
> it mean this fix:
> * fixed: regression in mergeinfo-aware merges against 1.5.3
> 
> Where was a problem and how did you indicate it ?
> 
> Can You send me some info or link ?
> 

I don't know the details but this is how I would find the info.

You read the Changes file for the 1.5.4 release 
(http://svn.collab.net/repos/svn/tags/1.5.4/CHANGES) which mentions this 
fix. At the end of the line it actually lists the revision numbers which 
contain the fixes (i.e. r33693, and r33704).

The log messages on Subversion commits are pretty informative, so we 
look at those corresponding to r33693 and r33704... or if we look at the 
log messages where these fixes were merged to the 1.5.x branch 
(http://svn.collab.net/repos/svn/branches/1.5.x) , we see:

------- Excerpt of r33827 log message ----
Merge r33693, r33704 from trunk:

  * r33693, r33704
    Fix merge bug introduced in the backport of the r29969, r32463, r33013,
    r33016, r33022, r33112 group in 1.5.3.
    Notes:
      There is a minor whitespace conflict in merge.c.
    Justification:
      This bug is a regression in 1.5.3, breaks mergeinfo aware merges when
      ecountered, and has already been seen a couple times in our own repos,
      see 
http://subversion.tigris.org/servlets/ReadMsg?list=dev&&msgNo=144187
      and http://subversion.tigris.org/issues/show_bug.cgi?id=3294#desc1.

----- End excerpt ----

I would look at the 2 links referenced in the log message for more details.








---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org