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.
>
> Modified:
> branches/1.5.x/ (props changed)
> branches/1.5.x/CHANGES (props changed)
> branches/1.5.x/STATUS
> branches/1.5.x/notes/reintegrate-todo.txt (props changed)
> branches/1.5.x/notes/tree-conflicts/scratch-pad.txt (props changed)
> branches/1.5.x/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
> branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java
> branches/1.5.x/subversion/include/svn_client.h
> branches/1.5.x/subversion/include/svn_wc.h
> branches/1.5.x/subversion/svn/cl.h
> branches/1.5.x/subversion/svn/conflict-callbacks.c
> branches/1.5.x/subversion/svn/main.c
> branches/1.5.x/subversion/svn/resolved-cmd.c
> branches/1.5.x/www/images/subversion-diagram.png (props changed)
> branches/1.5.x/www/images/subversion_logo-200x173.png (props changed)
> branches/1.5.x/www/images/subversion_logo-384x332.png (props changed)
> branches/1.5.x/www/images/subversion_logo_hor-468x64.png (props changed)
>
> Merged:
> /trunk:r29188,29648,29650,29656,29660
This mail is the result of some testing of a custom patch applied to
svn.collab.net for including root-of-the-commit mergeinfo changes in our
commit mails.
Y'all like?
--
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Received on 2008-03-12 21:45:57 CET