# HG changeset patch # User Anton Shestakov # Date 1574916077 -25200 # Node ID 196ed65594dcfd15b1a634160fdece26cbc1aaa6 # Parent b9a7fb0a0a49afc5dd878621604f83af5ab3a8ab evolve: correct spelling of superseded everywhere else diff -r b9a7fb0a0a49 -r 196ed65594dc hgext3rd/evolve/obshistory.py --- a/hgext3rd/evolve/obshistory.py Thu Nov 28 11:37:56 2019 +0700 +++ b/hgext3rd/evolve/obshistory.py Thu Nov 28 11:41:17 2019 +0700 @@ -836,7 +836,7 @@ def _getobsfateandsuccs(repo, revnode, successorssets=None): """ Return a tuple containing: - - the reason a revision is obsolete (diverged, pruned or superseed) + - the reason a revision is obsolete (diverged, pruned or superseded) - the list of successors short node if the revision is neither pruned or has diverged """ diff -r b9a7fb0a0a49 -r 196ed65594dc tests/test-push-checkheads-pruned-B6.t --- a/tests/test-push-checkheads-pruned-B6.t Thu Nov 28 11:37:56 2019 +0700 +++ b/tests/test-push-checkheads-pruned-B6.t Thu Nov 28 11:41:17 2019 +0700 @@ -9,7 +9,7 @@ This case is part of a series of tests checking this behavior. Category B: simple case involving pruned changesets -TestCase 6: single changesets, pruned then superseeded (on a new changeset) +TestCase 6: single changesets, pruned then superseded (on a new changeset) .. old-state: .. diff -r b9a7fb0a0a49 -r 196ed65594dc tests/test-push-checkheads-pruned-B7.t --- a/tests/test-push-checkheads-pruned-B7.t Thu Nov 28 11:37:56 2019 +0700 +++ b/tests/test-push-checkheads-pruned-B7.t Thu Nov 28 11:41:17 2019 +0700 @@ -9,7 +9,7 @@ This case is part of a series of tests checking this behavior. Category B: simple case involving pruned changesets -TestCase 7: single changesets, pruned then superseeded (on an existing changeset) +TestCase 7: single changesets, pruned then superseded (on an existing changeset) .. old-state: .. diff -r b9a7fb0a0a49 -r 196ed65594dc tests/test-push-checkheads-unpushed-D6.t --- a/tests/test-push-checkheads-unpushed-D6.t Thu Nov 28 11:37:56 2019 +0700 +++ b/tests/test-push-checkheads-unpushed-D6.t Thu Nov 28 11:41:17 2019 +0700 @@ -9,7 +9,7 @@ This case is part of a series of tests checking this behavior. Category D: remote head is "obs-affected" locally, but result is not part of the push -TestCase 6: single changeset, superseeded then pruned (on a new changeset unpushed) changeset +TestCase 6: single changeset, superseded then pruned (on a new changeset unpushed) changeset This is a partial push variation of case B-6 diff -r b9a7fb0a0a49 -r 196ed65594dc tests/test-push-checkheads-unpushed-D7.t --- a/tests/test-push-checkheads-unpushed-D7.t Thu Nov 28 11:37:56 2019 +0700 +++ b/tests/test-push-checkheads-unpushed-D7.t Thu Nov 28 11:41:17 2019 +0700 @@ -9,7 +9,7 @@ This case is part of a series of tests checking this behavior. Category D: remote head is "obs-affected" locally, but result is not part of the push -TestCase 7: single changesets, superseeded multiple time then pruned (on a new changeset unpushed) changeset +TestCase 7: single changesets, superseded multiple time then pruned (on a new changeset unpushed) changeset This is a partial push variation of B6