* subversion/libsvn_fs/revs-txns.c   Geez.  clkao pointed out (indirectly) on IRC today that when I   merged from the issue-1578-dev branch, I resolved my conflicts in   pretty much exactly the wrong way.  So, er, fix that by copying the   contents of the last version on that branch into the trunk.  For   specifics, see the log messages for the issue-1578-dev branch.
* subversion/libsvn_fs/revs-txns.c
  Geez.  clkao pointed out (indirectly) on IRC today that when I
  merged from the issue-1578-dev branch, I resolved my conflicts in
  pretty much exactly the wrong way.  So, er, fix that by copying the
  contents of the last version on that branch into the trunk.  For
  specifics, see the log messages for the issue-1578-dev branch.

  


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@847878 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion