+ git.merge(bottom, git.get_head(), top, recursive = True)
+
+ print 'done'
+ elif options.update:
+ rev1 = git_id('//bottom')
+ rev2 = git_id('//top')
+ files = git.barefiles(rev1, rev2).split('\n')
+
+ print 'Updating with commit %s...' % commit_id,
+ sys.stdout.flush()
+
+ if not git.apply_diff(bottom, top, files = files):
+ raise CmdException, 'Patch updating failed'