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

Re: svn commit: r29766 - in branches/1.5.x: . notes notes/tree-conflicts subversion/bindings/javahl/native subversion/bindings/javahl/src/org/tigris/subversion/javahl subversion/include subversion/svn www/images

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Wed, 12 Mar 2008 16:46:15 -0400

kfogel_at_tigris.org wrote:
> Author: kfogel
> Date: Thu Mar 6 22:30:08 2008
> New Revision: 29766
>
> Log:
> Merge r29648, r29650, r29656, r29660 from trunk to branch, resolving
> conflicts in the obvious ways. These conflict resolutions effectively
> mean r29188 is merged in as well, so record it via --record-only.

This mail is the result of my testing an upgrade of mailer.py on
svn.collab.net to the version included with 1.5.0-alpha2.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-03-12 21:46:44 CET

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