From: Guido van Rossum <guido@python.org>
Date: Fri, 28 Apr 1995 15:33:03 +0000 (+0000)
Subject: Handled new and delete properly
X-Git-Tag: v1.3b1~331
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba244688c608917a25793622950a0ef176565d53;p=thirdparty%2FPython%2Fcpython.git

Handled new and delete properly
---

diff --git a/Demo/pdist/rcvs.py b/Demo/pdist/rcvs.py
index 5b7ace801d0a..9947bf1cf76b 100755
--- a/Demo/pdist/rcvs.py
+++ b/Demo/pdist/rcvs.py
@@ -28,6 +28,8 @@ class MyFile(File):
 		'C' -- conflict: changed locally as well as remotely
 		       (includes cases where the file has been added
 		       or removed locally and remotely)
+		'D' -- deleted remotely
+		'N' -- new remotely
 		'r' -- get rid of entry
 		'c' -- create entry
 		'u' -- update entry
@@ -80,11 +82,25 @@ class MyFile(File):
 	def update(self):
 		code = self.action()
 		print code, self.file
-		if code == 'U':
+		if code in ('U', 'N'):
 			self.get()
 		elif code == 'C':
 			print "%s: conflict resolution not yet implemented" % \
 			      self.file
+		elif code == 'D':
+			try:
+				os.unlink(self.file)
+			except os.error:
+				pass
+			self.eseen = 0
+		elif code == 'r':
+			self.eseen = 0
+		elif code in ('c', 'u'):
+			self.erev = self.rrev
+			self.enew = 0
+			self.edeleted = 0
+			self.esum = self.rsum
+			self.emtime, self.ectime = os.stat(self.file)[-2:]
 
 	def commit(self, message = ""):
 		code = self.action()