def test_state(self) : self.addFile('file') self.addRevisions('file',3) s = GitSandbox(self.defs['sandbox']) self.assertEquals(self.revisions[4], s.state()) self.rewind(3) self.assertEquals(self.revisions[1], s.state())
def test_state(self): self.addFile('file') self.addRevisions('file', 3) s = GitSandbox(self.defs['sandbox']) self.assertEquals(self.revisions[4], s.state()) self.rewind(3) self.assertEquals(self.revisions[1], s.state())
def test_update_withConflictPostpones(self) : self.addFile('file') self.addRevisions('file',3) s = GitSandbox(self.defs['sandbox']) self.rewind(2) self.addRevisions('file',1, False) # local conflicting change s.update() self.assertEquals(self.revisions[4], s.state())
def test_update_withConflictPostpones(self): self.addFile('file') self.addRevisions('file', 3) s = GitSandbox(self.defs['sandbox']) self.rewind(2) self.addRevisions('file', 1, False) # local conflicting change s.update() self.assertEquals(self.revisions[4], s.state())