# HG changeset patch # User Idan Kamara # Date 1321570187 -7200 # Node ID 3bbf6a3266f44ce822b19b0a857dd3a3cea1d515 # Parent 5661d5f7e39bb6ef1d554b76e979a1f48eac643f test-summary: fix test due to bookmarks being separated from tags in hg >= 2.0 diff -r 5661d5f7e39b -r 3bbf6a3266f4 tests/test-summary.py --- a/tests/test-summary.py Thu Nov 17 12:54:37 2011 -0600 +++ b/tests/test-summary.py Fri Nov 18 00:49:47 2011 +0200 @@ -74,14 +74,21 @@ other.bookmark('bmother') d['remote'] = (1, 1, 0, 1) - d['parent'] = [(0, node[:12], 'tip bmother', 'first')] + if self.client.version < (2, 0, 0): + d['parent'] = [(0, node[:12], 'tip bmother', 'first')] + else: + d['bookmarks'] = '*bmother' self.assertEquals(other.summary(remote=True), d) self.append('other/a', 'a') rev, node = other.commit('second in other') d['remote'] = (1, 1, 1, 1) - d['parent'] = [(1, node[:12], 'tip bmother', 'second in other')] + if self.client.version < (2, 0, 0): + tags = 'tip bmother' + else: + tags = 'tip' + d['parent'] = [(1, node[:12], tags, 'second in other')] self.assertEquals(other.summary(remote=True), d)