traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handled new and delete properly

This commit is contained in:
Guido van Rossum 1995-04-28 15:33:03 +00:00
parent 6bb4a51daa
commit ba244688c6
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Demo/pdist/rcvs.py
View File

@ -28,6 +28,8 @@ class MyFile(File):
'C' -- conflict: changed locally as well as remotely 'C' -- conflict: changed locally as well as remotely
(includes cases where the file has been added (includes cases where the file has been added
or removed locally and remotely) or removed locally and remotely)
'D' -- deleted remotely
'N' -- new remotely
'r' -- get rid of entry 'r' -- get rid of entry
'c' -- create entry 'c' -- create entry
'u' -- update entry 'u' -- update entry
@ -80,11 +82,25 @@ class MyFile(File):
def update(self): def update(self):
code = self.action() code = self.action()
print code, self.file print code, self.file
if code == 'U': if code in ('U', 'N'):
self.get() self.get()
elif code == 'C': elif code == 'C':
print "%s: conflict resolution not yet implemented" % \ print "%s: conflict resolution not yet implemented" % \
self.file 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 = ""): def commit(self, message = ""):
code = self.action() code = self.action()