equal
deleted
inserted
replaced
101 ctx2 = self[node2] |
101 ctx2 = self[node2] |
102 working = ctx2.rev() is None |
102 working = ctx2.rev() is None |
103 parentworking = working and ctx1 == self['.'] |
103 parentworking = working and ctx1 == self['.'] |
104 |
104 |
105 if match is None: |
105 if match is None: |
106 match = matchmod.always(self.root, self.getcwd()) |
106 match = matchmod.always() |
107 |
107 |
108 wlock = None |
108 wlock = None |
109 try: |
109 try: |
110 try: |
110 try: |
111 # updating the dirstate is optional |
111 # updating the dirstate is optional |