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

Re: svn commit: r39163 - in branches/1.6.x-r38000: . build/ac-macros subversion/libsvn_client subversion/libsvn_wc subversion/mod_dav_svn subversion/tests/cmdline

From: Paul Burba <ptburba_at_gmail.com>
Date: Wed, 16 Dec 2009 15:34:19 -0500

On Mon, Sep 7, 2009 at 9:07 AM, Stephen Butler <sbutler_at_elego.de> wrote:
> Author: sbutler
> Date: Mon Sep  7 07:07:09 2009
> New Revision: 39163
>
> Log:
> On ^/branches/1.6.x-r38000: bring up-to-date with ^/branches/1.6.x.
>
> Modified:
>   branches/1.6.x-r38000/   (props changed)
>   branches/1.6.x-r38000/CHANGES   (props changed)

Stephen,

Do you recall what client version you used to do this merge?

It created some strange mergeinfo on CHANGES

C:\SVN\src-branch-1.6.6>svn diff
https://svn.collab.net/repos/svn/branches/1.6.x-r38000/CHANGES@39163
-r39162:39163

Property changes on: CHANGES
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /branches/1.6.x-r38927/CHANGES:r38928-39102
   Merged /branches/1.6.x/CHANGES:r39009-39162
   Merged /trunk/CHANGES:r2-1281,38872,38875,38881,38927,39031,39074
                         ^^^^^^^
          These revs predate the earliest history of
           CHANGES, which was created in r1282.

I'm trying to reconstruct what happened here because this looks to be
causing us problems now when reintegrating other branches to 1.6.x
(http://mail-archives.apache.org/mod_mbox/subversion-commits/200912.mbox/browser).

Paul
Received on 2009-12-16 21:34:57 CET

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