Home
last modified time | relevance | path

Searched refs:remote_diff (Results 1 – 25 of 41) sorted by relevance

12

/dports/devel/py-nbdime/nbdime-3.1.1/nbdime/merging/
H A Ddecisions.py104 remote_diff = as_list(remote_diff)
121 remote_diff=remote_diff,
131 remote_diff=remote_diff,
147 remote_diff=remote_diff,
159 remote_diff=remote_diff,
171 remote_diff=remote_diff,
182 remote_diff=remote_diff,
258 remote_diff=remote_diff
269 remote_diff=remote_diff,
281 remote_diff=remote_diff,
[all …]
H A Dstrategies.py68 remote_diff = []
73 remote_diff.extend(rd)
75 remote_diff = combine_patches(remote_diff)
76 return local_diff, remote_diff
298 d1 = remote_diff
363 assert 1 <= len(remote_diff) <= 2
366 assert len(remote_diff) == 1 or remote_diff[1].op == DiffOp.REMOVERANGE
377 rremove = remote_diff[1].length if len(remote_diff) > 1 else 0
487 elif remote_diff is ParentDeleted:
547 d.remote_diff,
[all …]
H A Dgeneric.py172 remote_diff = as_dict_based_diff(remote_diff)
185 brdkeys = set(remote_diff.keys())
196 remote_diff.get(key))
204 rd = remote_diff[key]
638 def _merge_strings(base, local_diff, remote_diff, argument
663 [op_patch(linenumber, remote_diff)],
710 base, local_diff, remote_diff,
714 base, local_diff, remote_diff,
718 base, local_diff, remote_diff,
735 base, local_diff, remote_diff,
[all …]
H A Dautoresolve.py67 remote_diff = build_diffs(resolved_base, decisions, 'remote')
69 return callback(resolved_base, prefix, local_diff, remote_diff)
/dports/devel/py-nbdime/nbdime-3.1.1/nbdime/tests/
H A Dtest_merge.py27 assert d.remote_diff == diff
116 assert d.remote_diff == [op_addrange(1, [3])]
129 assert d.remote_diff == [op_addrange(1, [3])]
148 assert d.remote_diff == [op_addrange(0, [3])]
262 assert d.remote_diff == [op_addrange(0, [[2]])]
267 assert d.remote_diff == [op_addrange(0, [[4]])]
285 assert d.remote_diff == [op_addrange(1, r[2:])]
478 assert d.remote_diff == [op_add("n", r["n"])]
509 assert d.remote_diff == [op_replace("x", 3)]
522 assert d.remote_diff == [op_add("y", 5),
[all …]
H A Dtest_apply_merge.py37 di = dec.remote_diff
74 local_diff=None, remote_diff=None, custom_diff=None): argument
82 assert remote_diff
87 assert remote_diff
97 "remote_diff": remote_diff,
142 remote_diff=brd)
H A Dtest_decision_tools.py77 assert b.decisions[0].remote_diff == [op_remove("e")]
88 remote_diff=[op_patch("c", [op_remove("d")])]
100 remote_diff=[op_patch("c", [op_remove("e")])]
106 assert dec.remote_diff == [op_remove("e")]
115 remote_diff=[op_patch("c", [op_patch("d", [op_remove("f")])])]
121 assert dec.remote_diff == [op_remove("f")]
H A Dtest_merge_notebooks_inline.py105 assert decisions[0].remote_diff != []
111 assert decisions[0].remote_diff != []
624 remote_diff = diff(md_in[i]["conflicted"], md_in[k]["conflicted"])
628 assert remote_diff == sorted(remote_diff, key=lambda x: x.key)
633 "remote_diff": [op_patch("conflicted", remote_diff)],
735 remote_diff = diff(md_in[i]["conflicted"], md_in[k]["conflicted"])
739 assert remote_diff == sorted(remote_diff, key=lambda x: x.key)
744 "remote_diff": [op_patch("conflicted", remote_diff)],
/dports/devel/py-nbdime/nbdime-3.1.1/packages/nbdime/test/src/merge/
H A Ddecisions.spec.ts41 remote_diff: [opAdd('two', 33)],
51 expect(value.remoteDiff).toEqual(jsonStructure.remote_diff);
61 jsonStructure.remote_diff,
131 jsonStructure.remote_diff
139 jsonStructure.remote_diff!,
148 jsonStructure.remote_diff!,
162 jsonStructure.remote_diff,
637 remote_diff: [opAddRange(0, ['not '])],
642 remote_diff: [opAdd('foo', true)],
651 remote_diff: [opRemoveRange(1, 1)],
[all …]
H A Dmodel.spec.ts104 remote_diff: [],
110 remote_diff: [opReplace('collapsed', true)],
120 remote_diff: [
137 remote_diff: [opRemoveRange(0, 1)],
/dports/devel/py-nbdime/nbdime-3.1.1/docs/source/
H A Dmerging.rst36 "remote_diff": <diff object>,
64 - **remote**: Use the ``remote`` changes as described by ``remote_diff``.
/dports/sysutils/bareos-server/bareos-Release-20.0.3/regress/tests/
H A Dremote-fd-test109 $bperl -e remote_diff
/dports/sysutils/bareos19-client/bareos-Release-19.2.11/regress/tests/
H A Dremote-fd-test109 $bperl -e remote_diff
/dports/sysutils/bareos18-traymonitor/bareos-Release-18.2.12/regress/tests/
H A Dremote-fd-test109 $bperl -e remote_diff
/dports/sysutils/bareos19-server/bareos-Release-19.2.11/regress/tests/
H A Dremote-fd-test109 $bperl -e remote_diff
/dports/sysutils/bareos-client/bareos-Release-20.0.3/regress/tests/
H A Dremote-fd-test109 $bperl -e remote_diff
/dports/sysutils/bareos18-server/bareos-Release-18.2.12/regress/tests/
H A Dremote-fd-test109 $bperl -e remote_diff
/dports/sysutils/bareos-traymonitor/bareos-Release-20.0.3/regress/tests/
H A Dremote-fd-test109 $bperl -e remote_diff
/dports/sysutils/bareos18-client/bareos-Release-18.2.12/regress/tests/
H A Dremote-fd-test109 $bperl -e remote_diff
/dports/sysutils/bareos19-traymonitor/bareos-Release-19.2.11/regress/tests/
H A Dremote-fd-test109 $bperl -e remote_diff
/dports/www/bareos18-webui/bareos-Release-18.2.12/regress/tests/
H A Dremote-fd-test109 $bperl -e remote_diff
/dports/www/bareos-webui/bareos-Release-20.0.3/regress/tests/
H A Dremote-fd-test109 $bperl -e remote_diff
/dports/www/bareos19-webui/bareos-Release-19.2.11/regress/tests/
H A Dremote-fd-test109 $bperl -e remote_diff
/dports/devel/py-nbdime/nbdime-3.1.1/packages/nbdime/src/merge/
H A Ddecisions.ts34 remote_diff?: IDiffEntry[] | null; property
124 remoteDiff = valueOrDefault(obj.remote_diff, remoteDiff);
200 remote_diff: stripSource(this.remoteDiff),
/dports/devel/py-nbdime/nbdime-3.1.1/nbdime/
H A Dnbmergeapp.py88 bld.agreement([], local_diff=diff, remote_diff=diff)

12