Ignore:
Timestamp:
May 7, 2011, 12:42:44 PM (14 years ago)
Author:
gav
Message:

Svn merge -r874:r919 trunk/ into branches/features/purchaseOrders.
This brings the purchaseOrder branch fully up to date.

Location:
branches/features/purchaseOrders
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/features/purchaseOrders

  • branches/features/purchaseOrders/scripts/_UpdateRev.groovy

    r531 r920  
    114114            return fail(code:"vcs.working.copy.not.found", args:[basedir])
    115115
    116     // Use svnkit to get the base revision.
     116    // Use svnkit to get the last committed revision.
    117117    def clientManager = SVNClientManager.newInstance()
    118118    def wcClient = clientManager.getWCClient()
    119119    try {
    120         result.revision = wcClient.doInfo(wc, SVNRevision.BASE).getRevision().toString()
     120        result.revision = wcClient.doInfo(wc, SVNRevision.BASE).getCommittedRevision().toString()
    121121    }
    122122    catch(org.tmatesoft.svn.core.SVNException e) {
Note: See TracChangeset for help on using the changeset viewer.