mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-01 09:08:51 +00:00
4f30417ffd
In order to store conflicts in the commit, as conflicts between a set of trees, we want to be able merge those trees on the fly. This introduces a type for that. It has a `Merge(Conflict(Tree))` variant, where the individual trees cannot have path-level conflicts. It also has a `Legacy(Tree)` variant, which does allow path-level conflicts. I think that should help us with the migration.
68 lines
1.6 KiB
Rust
68 lines
1.6 KiB
Rust
// Copyright 2020 The Jujutsu Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//! Jujutsu version control system.
|
|
|
|
#![warn(missing_docs)]
|
|
#![deny(unused_must_use)]
|
|
|
|
#[macro_use]
|
|
mod content_hash;
|
|
|
|
pub mod backend;
|
|
pub mod commit;
|
|
pub mod commit_builder;
|
|
pub mod conflicts;
|
|
pub mod dag_walk;
|
|
pub mod default_index_store;
|
|
pub mod default_revset_engine;
|
|
pub mod default_revset_graph_iterator;
|
|
pub mod default_submodule_store;
|
|
pub mod diff;
|
|
pub mod file_util;
|
|
pub mod files;
|
|
pub mod fsmonitor;
|
|
pub mod git;
|
|
pub mod git_backend;
|
|
pub mod gitignore;
|
|
pub mod hex_util;
|
|
pub mod id_prefix;
|
|
pub mod index;
|
|
pub mod local_backend;
|
|
pub mod lock;
|
|
pub mod matchers;
|
|
pub mod merge;
|
|
pub mod merged_tree;
|
|
pub mod op_heads_store;
|
|
pub mod op_store;
|
|
pub mod operation;
|
|
#[allow(missing_docs)]
|
|
pub mod protos;
|
|
pub mod refs;
|
|
pub mod repo;
|
|
pub mod repo_path;
|
|
pub mod revset;
|
|
pub mod rewrite;
|
|
pub mod settings;
|
|
pub mod simple_op_heads_store;
|
|
pub mod simple_op_store;
|
|
pub mod stacked_table;
|
|
pub mod store;
|
|
pub mod submodule_store;
|
|
pub mod transaction;
|
|
pub mod tree;
|
|
pub mod tree_builder;
|
|
pub mod view;
|
|
pub mod working_copy;
|
|
pub mod workspace;
|