Replace stack_merge_new function with two simpler functions

- merge(version1, version2)
- split(version)
This commit is contained in:
Max Brunsfeld 2016-05-28 21:22:10 -07:00
parent e686478ad2
commit 6535704870
4 changed files with 42 additions and 42 deletions

View file

@ -103,13 +103,14 @@ StackPopResult ts_stack_pop_pending(Stack *, StackVersion);
StackPopResult ts_stack_pop_all(Stack *, StackVersion);
StackVersion ts_stack_split(Stack *, StackVersion);
bool ts_stack_merge(Stack *, StackVersion, StackVersion);
void ts_stack_merge_from(Stack *, StackVersion);
void ts_stack_merge_all(Stack *);
void ts_stack_merge_new(Stack *, StackVersion base_version,
StackVersion new_version);
void ts_stack_renumber_version(Stack *, StackVersion, StackVersion);
StackVersion ts_stack_duplicate_version(Stack *, StackVersion);