Checkout
Bert Huijben
committed
on 05 Jul 12
Combine the code to convert from separate in-db values to a conflict skel in
one place instead of writing it a third time for the format bum… Show more
Combine the code to convert from separate in-db values to a conflict skel in

one place instead of writing it a third time for the format bump code. Add

an initial version of the format bump code.

* subversion/libsvn_wc/entries.c

 (insert_actual_node): Use svn_wc__upgrade_conflict_skel_from_raw().

* subversion/libsvn_wc/upgrade.c

 (includes): Add conflicts.h

 (svn_wc__upgrade_conflict_skel_from_raw): New function.

 (bump_to_30): New function.

 (svn_wc__upgrade_sdb): Add disabled bump to 30.

* subversion/libsvn_wc/wc.h

 (svn_wc__upgrade_conflict_skel_from_raw): New function.

* subversion/libsvn_wc/wc_db.c

 (svn_wc__upgrade_conflict_skel_from_raw): Use

    svn_wc__upgrade_conflict_skel_from_raw instead of duplicating the code.

Show less