Home
last modified time | relevance | path

Searched refs:clean_merge (Results 1 – 24 of 24) sorted by relevance

/dports/math/polymake/polymake-4.5/perllib/Polymake/Core/
H A DPreference.pm115 my ($clean_merge, @remerge);
131 $clean_merge = clone($self);
136 } elsif (defined($clean_merge)) {
137 merge_items($clean_merge, $src);
142 $clean_merge->cleanup_table = \@remerge if defined($clean_merge);
149 my ($self, $clean_merge) = @_;
170 merge_items($clean_merge, $src);
175 $clean_merge->cleanup_table = \@remerge;
178 $self->items = $clean_merge->items;
179 $self->labels = $clean_merge->labels;
[all …]
/dports/devel/codeville/codeville-0.1.18/Codeville/
H A Dupgrade.py127 clean_merge = True
131 clean_merge = False
140 clean_merge = False
236 if clean_merge and force_new_cset:
/dports/devel/git-svn/git-2.34.1/
H A Dmerge-recursive.c2769 clean_merge = 0; in process_renames()
2791 clean_merge = 0; in process_renames()
2902 return clean_merge; in process_renames()
3286 int clean_merge = 1; in process_entry() local
3337 clean_merge = 0; in process_entry()
3339 clean_merge = -1; in process_entry()
3350 clean_merge = 0; in process_entry()
3352 clean_merge = -1; in process_entry()
3390 clean_merge = 0; in process_entry()
3419 clean_merge = 0; in process_entry()
[all …]
H A Dmerge-ort.c2218 int *clean_merge) in check_for_directory_rename() argument
2268 *clean_merge &= (new_path != NULL); in check_for_directory_rename()
2447 int clean_merge = 1, i; in process_renames() local
2537 clean_merge = handle_content_merge(opt, in process_renames()
2545 if (!clean_merge && in process_renames()
2744 return clean_merge; in process_renames()
3798 unsigned clean_merge; in process_entry() local
3803 clean_merge = handle_content_merge(opt, path, o, a, b, in process_entry()
3807 ci->merged.clean = clean_merge && in process_entry()
3812 if (clean_merge && ci->df_conflict) { in process_entry()
[all …]
/dports/devel/git-gui/git-2.34.1/
H A Dmerge-recursive.c2769 clean_merge = 0; in process_renames()
2791 clean_merge = 0; in process_renames()
2902 return clean_merge; in process_renames()
3286 int clean_merge = 1; in process_entry() local
3337 clean_merge = 0; in process_entry()
3339 clean_merge = -1; in process_entry()
3350 clean_merge = 0; in process_entry()
3352 clean_merge = -1; in process_entry()
3390 clean_merge = 0; in process_entry()
3419 clean_merge = 0; in process_entry()
[all …]
H A Dmerge-ort.c2218 int *clean_merge) in check_for_directory_rename() argument
2268 *clean_merge &= (new_path != NULL); in check_for_directory_rename()
2447 int clean_merge = 1, i; in process_renames() local
2537 clean_merge = handle_content_merge(opt, in process_renames()
2545 if (!clean_merge && in process_renames()
2744 return clean_merge; in process_renames()
3798 unsigned clean_merge; in process_entry() local
3803 clean_merge = handle_content_merge(opt, path, o, a, b, in process_entry()
3807 ci->merged.clean = clean_merge && in process_entry()
3812 if (clean_merge && ci->df_conflict) { in process_entry()
[all …]
/dports/devel/git-p4/git-2.34.1/
H A Dmerge-recursive.c2769 clean_merge = 0; in process_renames()
2791 clean_merge = 0; in process_renames()
2902 return clean_merge; in process_renames()
3286 int clean_merge = 1; in process_entry() local
3337 clean_merge = 0; in process_entry()
3339 clean_merge = -1; in process_entry()
3350 clean_merge = 0; in process_entry()
3352 clean_merge = -1; in process_entry()
3390 clean_merge = 0; in process_entry()
3419 clean_merge = 0; in process_entry()
[all …]
H A Dmerge-ort.c2218 int *clean_merge) in check_for_directory_rename() argument
2268 *clean_merge &= (new_path != NULL); in check_for_directory_rename()
2447 int clean_merge = 1, i; in process_renames() local
2537 clean_merge = handle_content_merge(opt, in process_renames()
2545 if (!clean_merge && in process_renames()
2744 return clean_merge; in process_renames()
3798 unsigned clean_merge; in process_entry() local
3803 clean_merge = handle_content_merge(opt, path, o, a, b, in process_entry()
3807 ci->merged.clean = clean_merge && in process_entry()
3812 if (clean_merge && ci->df_conflict) { in process_entry()
[all …]
/dports/devel/git/git-2.34.1/
H A Dmerge-recursive.c2769 clean_merge = 0; in process_renames()
2791 clean_merge = 0; in process_renames()
2902 return clean_merge; in process_renames()
3286 int clean_merge = 1; in process_entry() local
3337 clean_merge = 0; in process_entry()
3339 clean_merge = -1; in process_entry()
3350 clean_merge = 0; in process_entry()
3352 clean_merge = -1; in process_entry()
3390 clean_merge = 0; in process_entry()
3419 clean_merge = 0; in process_entry()
[all …]
H A Dmerge-ort.c2218 int *clean_merge) in check_for_directory_rename() argument
2268 *clean_merge &= (new_path != NULL); in check_for_directory_rename()
2447 int clean_merge = 1, i; in process_renames() local
2537 clean_merge = handle_content_merge(opt, in process_renames()
2545 if (!clean_merge && in process_renames()
2744 return clean_merge; in process_renames()
3798 unsigned clean_merge; in process_entry() local
3803 clean_merge = handle_content_merge(opt, path, o, a, b, in process_entry()
3807 ci->merged.clean = clean_merge && in process_entry()
3812 if (clean_merge && ci->df_conflict) { in process_entry()
[all …]
/dports/devel/git-cvs/git-2.34.1/
H A Dmerge-recursive.c2769 clean_merge = 0; in process_renames()
2791 clean_merge = 0; in process_renames()
2902 return clean_merge; in process_renames()
3286 int clean_merge = 1; in process_entry() local
3337 clean_merge = 0; in process_entry()
3339 clean_merge = -1; in process_entry()
3350 clean_merge = 0; in process_entry()
3352 clean_merge = -1; in process_entry()
3390 clean_merge = 0; in process_entry()
3419 clean_merge = 0; in process_entry()
[all …]
H A Dmerge-ort.c2218 int *clean_merge) in check_for_directory_rename() argument
2268 *clean_merge &= (new_path != NULL); in check_for_directory_rename()
2447 int clean_merge = 1, i; in process_renames() local
2537 clean_merge = handle_content_merge(opt, in process_renames()
2545 if (!clean_merge && in process_renames()
2744 return clean_merge; in process_renames()
3798 unsigned clean_merge; in process_entry() local
3803 clean_merge = handle_content_merge(opt, path, o, a, b, in process_entry()
3807 ci->merged.clean = clean_merge && in process_entry()
3812 if (clean_merge && ci->df_conflict) { in process_entry()
[all …]
/dports/devel/cgit/cgit-1.2.3/git/
H A Dmerge-recursive.c2765 clean_merge = 0; in process_renames()
2787 clean_merge = 0; in process_renames()
2888 return clean_merge; in process_renames()
3275 int clean_merge = 1; in process_entry() local
3326 clean_merge = 0; in process_entry()
3328 clean_merge = -1; in process_entry()
3339 clean_merge = 0; in process_entry()
3341 clean_merge = -1; in process_entry()
3379 clean_merge = 0; in process_entry()
3408 clean_merge = 0; in process_entry()
[all …]
/dports/games/wesnoth/wesnoth-1.14.17/src/terrain/
H A Dterrain.cpp336 bool clean_merge = true; in create_terrain_maps() local
338 clean_merge &= egs.insert(t).second; in create_terrain_maps()
341 clean_merge &= egs.insert(t).second; in create_terrain_maps()
346 if(clean_merge) { in create_terrain_maps()
/dports/net-p2p/litecoin/litecoin-0.18.1/contrib/verify-commits/
H A Dverify-commits.py137 …check_merge = commit_time > time.time() - args.clean_merge * 24 * 60 * 60 # Only check commits in…
/dports/net-p2p/litecoin-daemon/litecoin-0.18.1/contrib/verify-commits/
H A Dverify-commits.py137 …check_merge = commit_time > time.time() - args.clean_merge * 24 * 60 * 60 # Only check commits in…
/dports/net-p2p/litecoin-utils/litecoin-0.18.1/contrib/verify-commits/
H A Dverify-commits.py137 …check_merge = commit_time > time.time() - args.clean_merge * 24 * 60 * 60 # Only check commits in…
/dports/net-p2p/bitcoin/bitcoin-22.0/contrib/verify-commits/
H A Dverify-commits.py147 …check_merge = commit_time > time.time() - args.clean_merge * 24 * 60 * 60 # Only check commits in…
/dports/net-p2p/bitcoin-daemon/bitcoin-22.0/contrib/verify-commits/
H A Dverify-commits.py147 …check_merge = commit_time > time.time() - args.clean_merge * 24 * 60 * 60 # Only check commits in…
/dports/net-p2p/bitcoin-utils/bitcoin-22.0/contrib/verify-commits/
H A Dverify-commits.py147 …check_merge = commit_time > time.time() - args.clean_merge * 24 * 60 * 60 # Only check commits in…
/dports/net-p2p/namecoin-utils/namecoin-core-nc0.21.0.1/contrib/verify-commits/
H A Dverify-commits.py147 …check_merge = commit_time > time.time() - args.clean_merge * 24 * 60 * 60 # Only check commits in…
/dports/net-p2p/namecoin/namecoin-core-nc0.21.0.1/contrib/verify-commits/
H A Dverify-commits.py147 …check_merge = commit_time > time.time() - args.clean_merge * 24 * 60 * 60 # Only check commits in…
/dports/net-p2p/namecoin-daemon/namecoin-core-nc0.21.0.1/contrib/verify-commits/
H A Dverify-commits.py147 …check_merge = commit_time > time.time() - args.clean_merge * 24 * 60 * 60 # Only check commits in…
/dports/net-p2p/qtum/qtum-mainnet-fastlane-v0.20.3/contrib/verify-commits/
H A Dverify-commits.py147 …check_merge = commit_time > time.time() - args.clean_merge * 24 * 60 * 60 # Only check commits in…