86
86
deployment = Deployment()
87
87
deployment.check_ongoing( True )
94
93
message += 'Conflicts in %s:\n %s' % \
100
97
message += 'Deployment conflicts:\n %s' % \
108
102
# copy-out changes from repo
111
108
# now we've copied-out, revert any copied-in changes!
112
109
if the.verbose: print "reverting %s" % the.repo.dir