Lines Matching refs:xConflict
51 proc xConflict args { return "OMIT" }
56 sqlite3changeset_apply db $::C xConflict
98 proc xConflict args { return "OMIT" }
102 sqlite3changeset_apply db $::C xConflict
165 proc xConflict {ret args} { return $ret }
182 sqlite3changeset_apply db $C1 [list xConflict OMIT]
192 set rebase [sqlite3changeset_apply_v2 db $::C2 [list xConflict OMIT]]
203 set rebase [sqlite3changeset_apply_v2 db $::C2 [list xConflict REPLACE]]
212 set ::rebase [sqlite3changeset_apply_v2 db $::C2 [list xConflict REPLACE]]
226 set ::rebase [sqlite3changeset_apply_v2 db $::C2 [list xConflict OMIT]]
247 proc xConflict {ret args} { return $ret }
264 set ::rebase1 [sqlite3changeset_apply_v2 db $::C1 [list xConflict OMIT]]
265 set ::rebase2 [sqlite3changeset_apply_v2 db $::C2 [list xConflict OMIT]]