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