##// END OF EJS Templates
clean: check that there are no conflicts after...
Martin von Zweigbergk -
r45005:abcc82bf default
parent child Browse files
Show More
@@ -1040,10 +1040,10 b' def update(repo, node, quietempty=False,'
1040 def clean(repo, node, show_stats=True, quietempty=False):
1040 def clean(repo, node, show_stats=True, quietempty=False):
1041 """forcibly switch the working directory to node, clobbering changes"""
1041 """forcibly switch the working directory to node, clobbering changes"""
1042 stats = updaterepo(repo, node, True)
1042 stats = updaterepo(repo, node, True)
1043 assert stats.unresolvedcount == 0
1043 repo.vfs.unlinkpath(b'graftstate', ignoremissing=True)
1044 repo.vfs.unlinkpath(b'graftstate', ignoremissing=True)
1044 if show_stats:
1045 if show_stats:
1045 _showstats(repo, stats, quietempty)
1046 _showstats(repo, stats, quietempty)
1046 return stats.unresolvedcount > 0
1047
1047
1048
1048
1049 # naming conflict in updatetotally()
1049 # naming conflict in updatetotally()
General Comments 0
You need to be logged in to leave comments. Login now