ilyagr/pijul - Change ZFSIT55UO5CEMMNAARCEXHK5INIXZUSPTT4OQUVGBO67EAGR6PVQC

Solving a conflict

Created by pmeunier on February 23, 2023

ZFSIT55UO5CEMMNAARCEXHK5INIXZUSPTT4OQUVGBO67EAGR6PVQC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/vertex_buffer.rs at line 165 [4.217202]

B:BD[4.221091] → [2.734:796]

            changes: side.iter().cloned().cloned().collect(),

[4.221091]

[2.796]

            changes: sides.iter().flat_map(|(_, b)| b.iter()).cloned().cloned().collect(),

Replacement in libpijul/src/vertex_buffer.rs at line 179 [4.217202]

B:BD[4.221363] → [2.861:926]

            changes: add_del.iter().cloned().cloned().collect(),

[4.221363]

[2.926]

            changes: add_del.iter().flat_map(|(_, b)| b.iter()).cloned().cloned().collect(),

Deletion in libpijul/src/vertex_buffer.rs at line 193 [4.217202]

B:BD[3.2765] → [3.2765:2996]

    }
}
pub fn change_message<C: ChangeStore>(changes: &C, hash: &Hash) -> String {
    match changes.get_header(hash) {
        Ok(header) => header.message.lines().next().unwrap().to_string(),
        Err(_e) => "".to_string(),

Replacement in libpijul/src/vertex_buffer.rs at line 194 [4.217202]

B:BD[4.221703] → [2.1041:1133]

    fn conflict_next(&mut self, id_: usize, side: &[&Hash]) -> Result<(), std::io::Error> {

[4.221703]

[2.1133]

    fn conflict_next<C: ChangeStore>(&mut self, id_: usize, sides: Option<(&C, &[&Hash])>) -> Result<(), std::io::Error> {

Replacement in libpijul/src/vertex_buffer.rs at line 198 [4.217202]

B:BD[2.1306] → [2.1306:1368]

                    changes.extend(side.into_iter().cloned())

[2.1306]

[2.1368]

                    changes.extend(sides.into_iter().flat_map(|(_, b)| b.into_iter()).cloned())

Replacement in libpijul/src/vertex_buffer.rs at line 201 [4.217202]

B:BD[2.1473] → [2.1473:1535]

                    changes.extend(side.into_iter().cloned())

[2.1473]

[2.1535]

                    changes.extend(sides.into_iter().flat_map(|(_, b)| b.into_iter()).cloned())

Replacement in libpijul/src/vertex_buffer.rs at line 204 [4.217202]

B:BD[2.1640] → [2.1640:1702]

                    changes.extend(side.into_iter().cloned())

[2.1640]

[2.1702]

                    changes.extend(sides.into_iter().flat_map(|(_, b)| b.into_iter()).cloned())

Replacement in libpijul/src/vertex_buffer.rs at line 209 [4.217202]

B:BD[2.1772] → [2.1772:1830]

        self.output_conflict_marker(SEPARATOR, id_, side)

[2.1772]

[2.1830]

        self.output_conflict_marker(SEPARATOR, id_, sides)

Insertion in libpijul/src/vertex_buffer.rs at line 213 [4.217202]

[4.221706]

pub fn change_message<C: ChangeStore>(changes: &C, hash: &Hash) -> String {
    match changes.get_header(hash) {
        Ok(header) => header.message.lines().next().unwrap().to_string(),
        Err(_e) => "".to_string(),
    }
}

Deletion in libpijul/src/alive/output.rs at line 66 [4.988425]

B:BD[2.7397] → [2.7397:7456]

B:BD[5.5956] → [3.5727:5810]

BD:BD[5.5956] → [3.5727:5810]

                    line_buf.begin_conflict(id, &[&ext])?;
                    line_buf.begin_conflict(id, Some((changes, &[&ext.into()])))?;

Solving an order conflict in libpijul/src/alive/output.rs at line 66 [4.988425]
[2.7397]

Insertion in libpijul/src/alive/output.rs at line 66 [4.988425]

[0.893]

[5.6022]

                    line_buf.begin_conflict(id, Some((changes, &[&ext])))?;

Insertion in libpijul/src/alive/output.rs at line 69 [4.988425]

[5.6063]

[3.5811]

                    std::mem::drop(channel);
                    std::mem::drop(txn);

Deletion in libpijul/src/alive/output.rs at line 88 [4.988425]

B:BD[2.7685] → [2.7685:7751]

B:BD[5.6529] → [3.5934:6024]

BD:BD[5.6529] → [3.5934:6024]

                        line_buf.conflict_next(elt.id, &[&ext])?;
                        line_buf.conflict_next(elt.id, Some((changes, &[&ext.into()])))?;

Solving an order conflict in libpijul/src/alive/output.rs at line 88 [4.988425]
[2.7685]

Insertion in libpijul/src/alive/output.rs at line 88 [4.988425]

[0.1058]

[5.6599]

                        line_buf.conflict_next(elt.id, Some((changes, &[&ext])))?;

Deletion in libpijul/src/alive/output.rs at line 283 [4.988425]

B:BD[5.6063] → [2.7457:7543]

BD:BD[5.6063] → [2.7457:7543]

                    std::mem::drop(channel);
                    std::mem::drop(txn);

Solving an order conflict in libpijul/src/alive/output.rs at line 283 [4.988425]
[4.995154]