Fix regexp matching while looking for svn revision.

tools/sync-webkit-git.py

 #!/usr/bin/python
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Update third_party/WebKit using git.
 
 Under the assumption third_party/WebKit is a clone of git.webkit.org,
 we can use git commands to make it match the version requested by DEPS.
 
@@ skipping 17 matching lines @@
 def GetWebKitRev():
   """Extract the 'webkit_revision' variable out of DEPS."""
   locals = {'Var': lambda _: ''}
   execfile('DEPS', {}, locals)
   return locals['vars']['webkit_revision']
 
 def FindSVNRev(rev):
   """Map an SVN revision to a git hash.
   Like 'git svn find-rev' but without the git-svn bits."""
   # We find r123 by grepping for a line with "git-svn-id: blahblahblah@123".
-  return RunGit(['rev-list', '-n', '1', '--grep=^git-svn-id: .*@%s$' % rev,
+  return RunGit(['rev-list', '-n', '1', '--grep=^git-svn-id: .*trunk@%s ' % rev,
                  'origin'])
 
 def UpdateGClientBranch(webkit_rev):
   """Update the magic gclient branch to point at |webkit_rev|.
 
   Returns: true if the branch didn't need changes."""
   target = FindSVNRev(webkit_rev)
   if not target:
     print "r%s not available; fetching." % webkit_rev
     subprocess.check_call(['git', 'fetch'])
@@ skipping 35 matching lines @@
   print 'Desired revision: r%s.' % webkit_rev
   os.chdir('third_party/WebKit')
   changed = UpdateGClientBranch(webkit_rev)
   if changed:
     UpdateCurrentCheckoutIfAppropriate()
   else:
     print "Already on correct revision."
 
 if __name__ == '__main__':
   main()