mx00s/pijul - Change TVVW53HZGYPODAXEQ4BFZNSPBOFG6JEDVOKIYIDZMWFAMOBKOR2QC

Conflict resolution

Created by pmeunier on May 11, 2021

TVVW53HZGYPODAXEQ4BFZNSPBOFG6JEDVOKIYIDZMWFAMOBKOR2QC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in libpijul/src/working_copy/mod.rs at line 20 [9.198172]

B:B[7.1728] → [8.24701:25038]

BD:B[7.1728] → [8.24701:25038]

    fn remove_path(&self, name: &str) -> Result<(), Self::Error>;
    fn rename(&self, former: &str, new: &str) -> Result<(), Self::Error>;
    fn set_permissions(&self, name: &str, permissions: u16) -> Result<(), Self::Error>;
    type Writer: std::io::Write;
    fn write_file(&self, file: &str) -> Result<Self::Writer, Self::Error>;

Deletion in libpijul/src/working_copy/mod.rs at line 26 [9.198172]
B:BD[7.2100] → [11.65:66]
BD:BD[7.2100] → [11.65:66]
Resurrecting zombie bytes in libpijul/src/working_copy/mod.rs at line 26 [9.198172]
B:B[11.66] → [12.0:38]
BD:B[11.66] → [12.0:38]
∅:∅[12.38] → [13.139:147]
B:B[13.139] → [13.139:147]
BD:B[13.139] → [13.139:147]
B:B[13.147] → [12.39:112]
BD:B[13.147] → [12.39:112]
∅:∅[12.112] → [13.213:233]
B:B[13.213] → [13.213:233]
BD:B[13.213] → [13.213:233]
B:B[13.252] → [13.252:351]
BD:B[13.252] → [13.252:351]
∅:∅[13.351] → [11.159:243]
B:B[11.159] → [11.159:243]
BD:B[11.159] → [11.159:243]
B:B[11.243] → [13.352:444]
BD:B[11.243] → [13.352:444]
B:B[13.444] → [12.113:167]
BD:B[13.444] → [12.113:167]
∅:∅[12.167] → [11.342:560]
∅:∅[13.513] → [11.342:560]
B:B[11.342] → [11.342:560]
BD:B[11.342] → [11.342:560]
B:B[11.560] → [12.168:245]
BD:B[11.560] → [12.168:245]
∅:∅[12.245] → [11.636:726]
B:B[11.636] → [11.636:726]
BD:B[11.636] → [11.636:726]
B:B[11.726] → [12.246:287]
BD:B[11.726] → [12.246:287]
∅:∅[12.287] → [11.788:859]
∅:∅[13.586] → [11.788:859]
B:B[11.788] → [11.788:859]
BD:B[11.788] → [11.788:859]
B:B[11.859] → [12.288:309]
BD:B[11.859] → [12.288:309]
∅:∅[12.309] → [11.891:922]
B:B[11.891] → [11.891:922]
BD:B[11.891] → [11.891:922]
B:B[11.922] → [12.310:327]
BD:B[11.922] → [12.310:327]
∅:∅[12.327] → [11.950:961]
B:B[11.950] → [11.950:961]
BD:B[11.950] → [11.950:961]
B:B[11.961] → [12.328:365]
BD:B[11.961] → [12.328:365]
∅:∅[13.588] → [13.588:609]
B:B[13.588] → [13.588:609]
BD:B[13.588] → [13.588:609]
B:B[13.938] → [13.938:946]
BD:B[13.938] → [13.938:946]
```
    /// Read the file into the buffer
    ///
    /// Returns the file's text encoding or None if it was a binary file
    fn decode_file(
        file: &str,
        buffer: &mut Vec<u8>,
    ) -> Result<Option<Encoding>, Self::Error> {
        let mut uncoded = Vec::new();
        self.read_file(&file, &mut uncoded)?;
        let mime = tree_magic_mini::from_u8(&uncoded);
        debug!("mime = {:?}", mime);
        let encoding = if mime.starts_with("text/") {
            let mut detector = EncodingDetector::new();
            detector.feed(&uncoded, true);
            let encoding = detector.guess(None, true);
            debug!("guessed encoding = {:?}", encoding.name());
            let (_decoded, encoding, malformed) = encoding.decode(&uncoded);
            debug!("final encoding = {:?}", encoding.name());
            if !malformed {
                Some(Encoding(encoding))
            } else {
                warn!("text file was malformed");
                None
            }
        } else {
            None
        };
        buffer.append(&mut uncoded);
        Ok(encoding)
    }
}
```
Solving an order conflict in libpijul/src/working_copy/mod.rs at line 26 [9.198172]
[8.25038]
[12.0]
Replacement in libpijul/src/working_copy/mod.rs at line 30 [9.198172]
B:BD[13.233] → [13.233:252]
BD:BD[13.233] → [13.233:252]
```
        &mut self,
```
[13.233]
[13.252]
```
        &self,
```
Deletion in libpijul/src/working_copy/mod.rs at line 55 [9.198172]
∅:D[12.365] → [13.587:588]
B:BD[11.998] → [13.587:588]
BD:BD[11.998] → [13.587:588]
Insertion in libpijul/src/vertex_buffer.rs at line 139 [9.217202]
[9.221793]
[9.221793]
```
    is_zombie: bool,
```
Insertion in libpijul/src/vertex_buffer.rs at line 148 [9.217202]
[9.221952]
[9.221952]
```
            is_zombie: false,
```

Insertion in libpijul/src/vertex_buffer.rs at line 202 [9.217202]

[9.223399]

[7.6541]

    fn end_conflict(&mut self) -> Result<(), std::io::Error> {
        self.is_zombie = false;
        self.output_conflict_marker(END_MARKER)
    }

Replacement in libpijul/src/vertex_buffer.rs at line 207 [9.217202]

∅:D[7.6613] → [9.223470:223520]

B:BD[9.223470] → [9.223470:223520]

        self.output_conflict_marker(START_MARKER)

[7.6613]

[9.223520]

        if self.is_zombie {
            Ok(())
        } else {
            self.is_zombie = true;
            self.begin_conflict()
        }
    }
    fn end_zombie_conflict(&mut self) -> Result<(), std::io::Error> {
        self.is_zombie = false;
        self.output_conflict_marker(END_MARKER)

Replacement in libpijul/src/unrecord/working_copy.rs at line 108 [9.225940]
B:BD[9.229205] → [14.0:48]
```
    let FileMetadata { basename, .. } = changes
```
[9.229205]
[14.48]
```
    let FileMetadata { basename, metadata, .. } = changes
```
Replacement in libpijul/src/unrecord/working_copy.rs at line 127 [9.225940]
B:BD[4.842] → [4.842:873]
```
            if meta.is_dir() {
```
[4.842]
[4.873]
```
            if metadata.is_dir() {
```
Deletion in libpijul/src/unrecord/working_copy.rs at line 198 [9.225940]
B:BD[9.229205] → [15.0:35]
BD:BD[9.229205] → [15.0:35]
```
    let (meta, basename) = changes
```
Solving an order conflict in libpijul/src/unrecord/working_copy.rs at line 198 [9.225940]
[9.231483]
File move: text.rs → text.rs.XSEODPNEN2Y2S
BF:BFD[9.248792] → [16.0:9]
[9.248792]
[17.10]
Insertion in libpijul/src/tests/mod.rs at line 119 [9.289338]
[18.613]
[5.0]
```
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
```
File move: data → data.XSEODPNEN2Y2S
BF:BFD[9.248792] → [16.10:16]
[9.248792]
[17.4375]
Solving an order conflict in libpijul/src/record.rs at line 12 [9.488880]
[8.40928]
[6.1496]
Deletion in libpijul/src/record.rs at line 14 [9.488880]
∅:D[14.124] → [18.692:734]
B:BD[9.489199] → [18.692:734]
```
use std::collections::{HashMap, HashSet};
```
Insertion in libpijul/src/record.rs at line 541 [9.488880]
[8.53266]
[8.53266]
```
                        changes,
```
Insertion in libpijul/src/record.rs at line 564 [9.488880]
[8.53804]
[8.53804]
```
        changes: &C,
```

Replacement in libpijul/src/record.rs at line 613 [9.488880]

B:BD[8.55791] → [8.55791:55892]

                rec.record_deleted_file(txn, txn.graph(channel), working_copy, &full_path, *vertex)?

[8.55791]

[8.55892]

                rec.record_deleted_file(txn, txn.graph(channel), working_copy, &full_path, *vertex, changes)?

Insertion in libpijul/src/record.rs at line 656 [9.488880]
[8.56892]
[8.56892]
```
        /*
```
Insertion in libpijul/src/record.rs at line 664 [9.488880]
[8.57212]
[8.57212]
```
         */
```
Deletion in libpijul/src/record.rs at line 668 [9.488880]
B:BD[9.495974] → [6.1611:1612]
BD:BD[9.495974] → [6.1611:1612]
∅:D[8.57327] → [9.496436:496437]
B:BD[9.496436] → [9.496436:496437]
B:BD[9.496437] → [18.735:790]
BD:BD[9.496437] → [18.735:790]
∅:D[18.885] → [19.49402:49474]
B:BD[9.496480] → [19.49402:49474]
D:D[9.496480] → [19.49402:49474]
BD:BD[9.496480] → [19.49402:49474]
B:BD[19.49474] → [5.84:179]
BD:BD[19.49474] → [5.84:179]
∅:D[5.179] → [18.886:947]
B:BD[19.49474] → [18.886:947]
BD:BD[19.49474] → [18.886:947]
∅:D[18.947] → [19.49475:49643]
B:BD[9.496630] → [19.49475:49643]
D:D[9.496630] → [19.49475:49643]
BD:BD[9.496630] → [19.49475:49643]
```
        let (contents, encoding) = if meta.is_file() {
            let start = ChangePosition(self.rec.contents.len().into());
            let encoding = working_copy.decode_file(&item.full_path, &mut self.rec.contents)?;
            self.rec.has_binary_files |= encoding.is_none();
            let end = ChangePosition(self.rec.contents.len().into());
            self.rec.largest_file = self.rec.largest_file.max(end.0.as_u64() - start.0.as_u64());
```
Resurrecting zombie bytes in libpijul/src/record.rs at line 668 [9.488880]
B:B[9.496480] → [8.57328:57391]
BD:B[9.496480] → [8.57328:57391]
BD:B[9.496480] → [8.57328:57391]
B:B[8.57460] → [8.57460:57611]
BD:B[8.57460] → [8.57460:57611]
BD:B[8.57460] → [8.57460:57611]
```
            let start = ChangePosition(contents.len().into());
            let end = ChangePosition(contents.len().into());
            self.largest_file = self.largest_file.max(end.0.as_u64() - start.0.as_u64());
```
Solving an order conflict in libpijul/src/record.rs at line 668 [9.488880]
[8.57327]
Insertion in libpijul/src/record.rs at line 668 [9.488880]
[0.925]
[8.57328]
```
        let (contents_, encoding) = if meta.is_file() {
```

Replacement in libpijul/src/record.rs at line 670 [9.488880]

B:BD[8.57391] → [8.57391:57460]

BD:BD[8.57391] → [8.57391:57460]

            working_copy.read_file(&item.full_path, &mut contents)?;

[8.57391]

[8.57460]

            let encoding = working_copy.decode_file(&item.full_path, &mut contents)?;
            self.has_binary_files |= encoding.is_none();

Deletion in libpijul/src/record.rs at line 674 [9.488880]
B:BD[8.57611] → [8.57611:57650]
BD:BD[8.57611] → [8.57611:57650]
BD:BD[8.57611] → [8.57611:57650]
B:BD[19.49750] → [8.57651:57716]
BD:BD[19.49750] → [8.57651:57716]
BD:BD[19.49750] → [8.57651:57716]
```
            self.has_binary_files |= {
                let utf8 = std::str::from_utf8(&contents[s..e]);
```
Resurrecting zombie bytes in libpijul/src/record.rs at line 674 [9.488880]
B:B[9.497208] → [8.57717:57747]
BD:B[9.497208] → [8.57717:57747]
BD:B[9.497208] → [8.57717:57747]
∅:∅[8.57747] → [20.0:29]
B:B[9.497247] → [20.0:29]
D:∅[9.497247] → [20.0:29]
BD:B[8.57747] → [20.0:29]
```
            contents.push(0);
            if end > start {
```
Deletion in libpijul/src/record.rs at line 699 [9.488880]
B:BD[9.497912] → [8.57748:57790]
```
        self.actions.push(Hunk::FileAdd {
```

Resurrecting zombie bytes in libpijul/src/record.rs at line 699 [9.488880]

B:B[9.497912] → [6.1613:1614]

BD:B[9.497912] → [6.1613:1614]

B:B[6.1687] → [6.1687:1851]

BD:B[6.1687] → [6.1687:1851]


        let file_meta = FileMetadata {
            metadata: meta,
            basename: item.basename.as_str(),
            encoding: encoding.clone(),
        };

Replacement in libpijul/src/record.rs at line 700 [9.488880]

B:BD[6.1614] → [6.1614:1687]

BD:BD[6.1614] → [6.1614:1687]

        let name_start = ChangePosition(self.rec.contents.len().into());

[6.1614]

[6.1687]

        let name_start = ChangePosition(contents.len().into());

Replacement in libpijul/src/record.rs at line 706 [9.488880]

B:BD[6.1851] → [6.1851:2007]

BD:BD[6.1851] → [6.1851:2007]

        file_meta.write(&mut self.rec.contents);
        let name_end = ChangePosition(self.rec.contents.len().into());
        self.rec.contents.push(0);

[6.1851]

[9.498023]

        file_meta.write(&mut contents);
        let name_end = ChangePosition(contents.len().into());
        contents.push(0);
        self.actions.push(Hunk::FileAdd {

Replacement in libpijul/src/record.rs at line 729 [9.488880]
B:BD[9.498736] → [9.498736:498758]
```
            contents,
```
[9.498736]
[9.498758]
```
            contents: contents_,
```
Deletion in libpijul/src/record.rs at line 801 [9.488880]
B:BD[21.6574] → [8.58547:58619]
BD:BD[21.6574] → [8.58547:58619]
```
                    |p| txn_.get_external(&p).unwrap().map(From::from),
```

Resurrecting zombie bytes in libpijul/src/record.rs at line 801 [9.488880]

B:B[21.6542] → [6.2008:2180]

BD:B[21.6542] → [6.2008:2180]

∅:∅[6.2180] → [14.361:393]

B:B[14.361] → [14.361:393]

BD:B[14.361] → [14.361:393]

            let mut meta = Vec::new();
            let FileMetadata {
                basename,
                metadata,
                encoding,
            } = changes
                .get_file_meta(

Insertion in libpijul/src/record.rs at line 808 [9.488880]

[14.393]

[21.6645]

                    |p| txn_.get_external(&p).unwrap().map(From::from),

Resurrecting zombie bytes in libpijul/src/record.rs at line 822 [9.488880]
B:B[22.204] → [14.394:450]
BD:B[22.204] → [14.394:450]
```
                        basename: basename.to_string(),
```
Insertion in libpijul/src/record.rs at line 822 [9.488880]
[19.50317]
[14.394]
```
                    former_parents.push(Parent {
```
Deletion in libpijul/src/record.rs at line 852 [9.488880]
B:BD[9.502201] → [6.2248:2309]
BD:BD[9.502201] → [6.2248:2309]
```
                    self.former_parents[0].encoding.clone(),
```
Solving an order conflict in libpijul/src/record.rs at line 852 [9.488880]
[8.59226]

Insertion in libpijul/src/record.rs at line 852 [9.488880]

[0.1521]

[23.33880]

                    former_parents[0].encoding.clone(),

Deletion in libpijul/src/record.rs at line 926 [9.488880]

B:BD[8.60119] → [8.60119:60561]

        let name_start = ChangePosition(contents.len().into());
        // Push the metadata, big-endian.
        contents.push((item.metadata.0 >> 8) as u8);
        contents.push((item.metadata.0 & 0xff) as u8);
        //
        contents.extend(item.basename.as_bytes());
        let name_end = ChangePosition(contents.len().into());
        contents.push(0);
        let name = &contents[name_start.0.as_usize()..name_end.0.as_usize()];

Resurrecting zombie bytes in libpijul/src/record.rs at line 926 [9.488880]
B:B[24.48] → [14.451:498]
BD:B[24.48] → [14.451:498]
B:B[14.571] → [14.571:653]
BD:B[14.571] → [14.571:653]
B:B[14.653] → [6.2780:2820]
BD:B[14.653] → [6.2780:2820]
∅:∅[6.2820] → [14.653:663]
B:B[14.653] → [14.653:663]
BD:B[14.653] → [14.653:663]
```
        let basename = item.basename.as_str();
        FileMetadata {
            metadata: item.metadata,
            basename,
            encoding: encoding.clone(),
        }
```
Solving an order conflict in libpijul/src/record.rs at line 926 [9.488880]
[8.60119]
[14.451]

Replacement in libpijul/src/record.rs at line 927 [9.488880]

B:BD[14.498] → [14.498:571]

BD:BD[14.498] → [14.498:571]

        let meta_start = ChangePosition(self.rec.contents.len().into());

[14.498]

[14.571]

        let meta_start = ChangePosition(contents.len().into());

Replacement in libpijul/src/record.rs at line 933 [9.488880]

B:BD[14.663] → [14.663:774]

BD:BD[14.663] → [14.663:774]

        .write(&mut self.rec.contents);
        let meta_end = ChangePosition(self.rec.contents.len().into());

[14.663]

[23.36030]

        .write(&mut contents);
        let meta_end = ChangePosition(contents.len().into());

Replacement in libpijul/src/record.rs at line 985 [9.488880]

B:BD[9.510318] → [8.60724:60783]

B:BD[9.510318] → [14.881:949]

                contents.truncate(name_start.0.as_usize())
                self.rec.contents.truncate(meta_start.0.as_usize())

[9.510318]

[9.510384]

                contents.truncate(meta_start.0.as_usize())

Replacement in libpijul/src/record.rs at line 988 [9.488880]

B:BD[9.510415] → [8.60784:60839]

B:BD[9.510415] → [14.950:1014]

            contents.truncate(name_start.0.as_usize())
            self.rec.contents.truncate(meta_start.0.as_usize())

[9.510415]

[9.510477]

            contents.truncate(meta_start.0.as_usize())

Deletion in libpijul/src/record.rs at line 1419 [9.488880]

B:BD[9.504310] → [6.2336:2383]

BD:BD[9.504310] → [6.2336:2383]

B:BD[21.6881] → [6.2384:2423]

BD:BD[21.6881] → [6.2384:2423]

B:BD[25.495] → [6.2424:2609]

BD:BD[25.495] → [6.2424:2609]

B:BD[25.851] → [6.2610:2656]

BD:BD[25.851] → [6.2610:2656]

B:BD[19.50856] → [6.2657:2690]

BD:BD[19.50856] → [6.2657:2690]

B:BD[9.504935] → [6.2691:2712]

BD:BD[9.504935] → [6.2691:2712]

B:BD[21.7149] → [6.2713:2742]

BD:BD[21.7149] → [6.2713:2742]

B:BD[19.50317] → [8.58745:58794]

BD:BD[19.50317] → [8.58745:58794]

                    let mut meta = Vec::new();
                            &mut meta,
                    let FileMetadata { basename: name, .. } = FileMetadata::read(&mut meta);
                    if !full_path.is_empty() {
                        full_path.push('/');
                    full_path.push_str(name);
                        changes,
        changes: &C,
                    changes,
                    former_parents.push(Parent {

Solving an order conflict in libpijul/src/record.rs at line 1419 [9.488880]
[9.525217]

Resurrecting zombie bytes in libpijul/src/pristine/sanakirja.rs at line 533 [9.531056]

B:B[19.68287] → [8.62143:62647]

BD:B[19.68287] → [8.62143:62647]

    let mut k = match cursor.set(txn, &key, None) {
        Ok(Some((k, _))) => k,
        Ok(None) => {
            if let Some((k, _)) = cursor.prev(txn).map_err(|x| BlockError::Txn(x.into()))? {
                k
            } else {
                debug!("find_block_end, no prev");
                return Err(BlockError::Block { block: p });
            }
        }
        Err(e) => {
            debug!("find_block_end: BLOCK ERROR");
            return Err(BlockError::Txn(e.into()));
        }

Insertion in libpijul/src/pristine/sanakirja.rs at line 533 [9.531056]

[26.36000]

[8.62143]

    let mut cursor =
        btree::cursor::Cursor::new(txn, graph).map_err(|x| BlockError::Txn(x.into()))?;

Deletion in libpijul/src/pristine/sanakirja.rs at line 2265 [9.531056]
B:BD[26.36000] → [6.3764:3873]
BD:BD[26.36000] → [6.3764:3873]
```
    let mut cursor =
        btree::cursor::Cursor::new(txn, graph).map_err(|x| BlockError::Txn(x.into()))?;
```
Solving an order conflict in libpijul/src/pristine/sanakirja.rs at line 2265 [9.531056]
[3.26498]
Deletion in libpijul/src/pristine/inode_metadata.rs at line 8 [9.641569]
B:BD[9.641877] → [8.72555:72594]
```
use byteorder::{BigEndian, ByteOrder};
```
Insertion in libpijul/src/pristine/inode_metadata.rs at line 50 [9.641569]
[27.220]
[9.643614]
```
    }
```
Resurrecting zombie bytes in libpijul/src/diff/replace.rs at line 8 [9.779907]
B:B[9.780225] → [28.150:186]
BD:B[9.780225] → [28.150:186]
```
use crate::text_encoding::Encoding;
```
Solving an order conflict in libpijul/src/diff/replace.rs at line 8 [9.779907]
[8.85662]
[28.150]

Resurrecting zombie bytes in libpijul/src/diff/replace.rs at line 83 [9.779907]

B:B[9.782229] → [28.225:324]

BD:B[9.782229] → [28.225:324]

                Some(Hunk::Edit {
                    change: c, local, ..
                }) => {

Insertion in libpijul/src/diff/replace.rs at line 83 [9.779907]
[9.782186]
[28.225]
```
            match self.actions.pop() {
```

Replacement in libpijul/src/diff/replace.rs at line 96 [9.779907]

B:BD[9.782625] → [8.86222:86297]

B:BD[9.782625] → [28.382:441]

                        self.actions.push(Hunk::Edit { change: c, local })
                        self.rec.actions.push(Hunk::Edit {

[9.782625]

[28.441]

                        self.actions.push(Hunk::Edit {

Deletion in libpijul/src/diff/replace.rs at line 361 [9.779907]
B:BD[9.782186] → [8.86119:86158]
BD:BD[9.782186] → [8.86119:86158]
```
            match self.actions.pop() {
```
Solving an order conflict in libpijul/src/diff/replace.rs at line 361 [9.779907]
[9.793237]
Resurrecting zombie bytes in libpijul/src/diff/mod.rs at line 5 [9.793247]
B:B[9.793368] → [28.640:677]
BD:B[9.793368] → [28.640:677]
```
use crate::text_encoding::Encoding;
```
Solving an order conflict in libpijul/src/diff/mod.rs at line 5 [9.793247]
[8.86417]
[28.640]
Resurrecting zombie bytes in libpijul/src/diff/delete.rs at line 9 [9.805350]
B:B[9.805702] → [28.1165:1201]
BD:B[9.805702] → [28.1165:1201]
```
use crate::text_encoding::Encoding;
```
Solving an order conflict in libpijul/src/diff/delete.rs at line 9 [9.805350]
[8.86899]
[28.1165]
Resurrecting zombie bytes in libpijul/src/change.rs at line 1 [9.831311]
B:B[9.831409] → [8.88731:88751]
BD:B[9.831409] → [8.88731:88751]
```
use crate::HashSet;
```
Resurrecting zombie bytes in libpijul/src/change.rs at line 2 [9.831311]
B:B[9.831438] → [8.88752:88784]
BD:B[9.831438] → [8.88752:88784]
```
use std::collections::BTreeSet;
```
Resurrecting zombie bytes in libpijul/src/change.rs at line 3 [9.831311]
B:B[9.831481] → [13.2946:2976]
BD:B[9.831481] → [13.2946:2976]
B:B[13.2977] → [28.1442:1502]
BD:B[13.2977] → [28.1442:1502]
```
use chrono::{DateTime, Utc};
use crate::pristine::*;
use crate::text_encoding::Encoding;
```
Solving an order conflict in libpijul/src/change.rs at line 3 [9.831311]
[8.88784]
[13.2946]
Deletion in libpijul/src/change.rs at line 5 [9.831311]
B:BD[13.2976] → [13.2976:2977]
BD:BD[13.2976] → [13.2976:2977]
Resurrecting zombie bytes in libpijul/src/change/text_changes.rs at line 1 [7.37976]
B:B[7.38019] → [8.89108:89128]
BD:B[7.38019] → [8.89108:89128]
```
use crate::HashMap;
```

Replacement in libpijul/src/change/text_changes.rs at line 580 [7.37976]

B:BD[7.57069] → [8.89461:89589]

B:BD[7.57069] → [28.3840:3992]

                Regex::new(r#"^(?P<n>\d+)\. File addition: "(?P<name>[^"]*)" in "(?P<parent>[^"]*)"(?P<perm> \S+)?"#).unwrap();
                Regex::new(r#"^(?P<n>\d+)\. File addition: "(?P<name>[^"]*)" in "(?P<parent>[^"]*)"(?P<perm> [^ ]+)? "(?P<encoding>[^"]*)""#).unwrap();

[7.57069]

[7.57195]

                Regex::new(r#"^(?P<n>\d+)\. File addition: "(?P<name>[^"]*)" in "(?P<parent>[^"]*)"(?P<perm> \S+)? "(?P<encoding>[^"]*)""#).unwrap();

Deletion in libpijul/src/change/text_changes.rs at line 636 [7.37976]
B:BD[7.59651] → [8.89630:89730]
BD:BD[7.59651] → [8.89630:89730]
```
            contents_.push((meta.0 >> 8) as u8);
            contents_.push((meta.0 & 0xff) as u8);
```
Replacement in libpijul/src/change/text_changes.rs at line 643 [7.37976]
B:BD[14.3176] → [14.3176:3216]
```
            meta.write(&mut contents_);
```
[14.3176]
[19.140931]
```
            meta.write(contents_);
```
Deletion in libpijul/src/change/text_changes.rs at line 781 [7.37976]
B:BD[7.64590] → [8.89731:89831]
BD:BD[7.64590] → [8.89731:89831]
```
            contents_.push((meta.0 >> 8) as u8);
            contents_.push((meta.0 & 0xff) as u8);
```
Replacement in libpijul/src/change/text_changes.rs at line 786 [7.37976]
B:BD[14.3349] → [14.3349:3389]
```
            meta.write(&mut contents_);
```
[14.3349]
[19.141265]
```
            meta.write(contents_);
```
Replacement in libpijul/Cargo.toml at line 119 [9.1020742]
B:BD[30.730] → [31.2:2]
∅:D[31.2] → [17.5871:5897]
B:BD[9.1023338] → [17.5871:5897]
```
tree_magic_mini = "1.0.0"
```
[30.730]
[17.5897]
```
tree_magic_mini = "3.0.0"
```
Replacement in Cargo.lock at line 5 [9.1030385]
B:BD[9.1030508] → [23.141416:141435]
```
version = "0.14.1"
```
[9.1030508]
[9.1030527]
```
version = "0.15.1"
```

Replacement in Cargo.lock at line 7 [9.1030385]

B:BD[9.1030592] → [23.141436:141514]

checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"

[9.1030592]

[9.1030670]

checksum = "03345e98af8f3d786b6d9f656ccfa6ac316d954e92bc4841f0bba20789d5fb5a"

Replacement in Cargo.lock at line 20 [9.1030385]
B:BD[9.1030923] → [9.1030923:1030942]
```
version = "0.7.15"
```
[9.1030923]
[9.1030942]
```
version = "0.7.18"
```

Replacement in Cargo.lock at line 22 [9.1030385]

B:BD[9.1031007] → [9.1031007:1031085]

checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"

[9.1031007]

[9.1031085]

checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"

Replacement in Cargo.lock at line 64 [9.1030385]
B:BD[9.1032392] → [2.99:118]
```
version = "0.3.57"
```
[9.1032392]
[9.1032411]
```
version = "0.3.59"
```

Replacement in Cargo.lock at line 66 [9.1030385]

B:BD[9.1032476] → [2.119:197]

checksum = "78ed203b9ba68b242c62b3fb7480f589dd49829be1edb3fe8fc8b4ffda2dcb8d"

[9.1032476]

[9.1032554]

checksum = "4717cfcbfaa661a0fd48f8453951837ae7e8f81e481fbb136e3202d72805a744"

Insertion in Cargo.lock at line 69 [9.1030385]
[9.1032585]
[9.1032585]
```
 "cc",
```
Replacement in Cargo.lock at line 106 [9.1030385]
B:BD[16.460] → [16.460:479]
```
version = "0.19.4"
```
[16.460]
[16.479]
```
version = "0.19.5"
```

Replacement in Cargo.lock at line 108 [9.1030385]

B:BD[16.544] → [16.544:622]

checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81"

[16.544]

[16.622]

checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"

Deletion in Cargo.lock at line 117 [9.1030385]

∅:D[16.691] → [9.1033914:1034177]

B:BD[9.1033914] → [9.1033914:1034177]

name = "blake2b_simd"
version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
dependencies = [
 "arrayref",
 "arrayvec",
 "constant_time_eq",
]
[[package]]

Replacement in Cargo.lock at line 133 [9.1030385]
B:BD[9.1034498] → [19.151342:151361]
```
version = "0.2.15"
```
[9.1034498]
[9.1034517]
```
version = "0.2.16"
```

Replacement in Cargo.lock at line 135 [9.1030385]

B:BD[9.1034582] → [19.151362:151440]

checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"

[9.1034582]

[9.1034660]

checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279"

Replacement in Cargo.lock at line 187 [9.1030385]
B:BD[17.5974] → [17.5974:5993]
```
version = "0.1.10"
```
[17.5974]
[17.5993]
```
version = "0.1.12"
```

Replacement in Cargo.lock at line 189 [9.1030385]

B:BD[17.6058] → [17.6058:6136]

checksum = "f866cba7596c2e70200523e399101d460514a5e59191223aa87d579e49e52025"

[17.6058]

[17.6136]

checksum = "459978032e1aa8d5ca411ee0057ea84f98a93a648ff9f78654e53f33447cf0f9"

Replacement in Cargo.lock at line 286 [9.1030385]
B:BD[8.117741] → [8.117741:117759]
```
version = "0.9.3"
```
[8.117741]
[8.117759]
```
version = "0.9.4"
```

Replacement in Cargo.lock at line 288 [9.1030385]

B:BD[8.117824] → [8.117824:117902]

checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"

[8.117824]

[8.117902]

checksum = "52fb27eab85b17fbb9f6fd667089e07d6a2eb8743d02639ee7f6a7a7729c9c94"

Replacement in Cargo.lock at line 299 [9.1030385]
B:BD[32.902] → [33.17922:17940]
```
version = "0.8.3"
```
[32.902]
[32.920]
```
version = "0.8.4"
```

Replacement in Cargo.lock at line 301 [9.1030385]

B:BD[32.985] → [33.17941:18019]

checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"

[32.985]

[32.1063]

checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278"

Replacement in Cargo.lock at line 375 [9.1030385]
B:BD[9.1040602] → [34.1993:2011]
```
version = "3.0.1"
```
[9.1040602]
[9.1040620]
```
version = "3.0.2"
```

Replacement in Cargo.lock at line 377 [9.1030385]

B:BD[9.1040685] → [34.2012:2090]

checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff"

[9.1040685]

[9.1040763]

checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"

Replacement in Cargo.lock at line 394 [9.1030385]
B:BD[9.1041091] → [9.1041091:1041109]
```
version = "0.3.5"
```
[9.1041091]
[9.1041109]
```
version = "0.3.6"
```

Replacement in Cargo.lock at line 396 [9.1030385]

B:BD[9.1041174] → [9.1041174:1041252]

checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"

[9.1041174]

[9.1041252]

checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"

Replacement in Cargo.lock at line 399 [9.1030385]
B:BD[9.1041278] → [35.295:317]
```
 "redox_users 0.3.5",
```
[9.1041278]
[30.791]
```
 "redox_users",
```
Replacement in Cargo.lock at line 410 [9.1030385]
B:BD[9.1041536] → [35.416:438]
```
 "redox_users 0.4.0",
```
[9.1041536]
[30.803]
```
 "redox_users",
```
Replacement in Cargo.lock at line 481 [9.1030385]
B:BD[9.1043005] → [2.781:805]
```
 "redox_syscall 0.2.6",
```
[9.1043005]
[30.827]
```
 "redox_syscall",
```
Replacement in Cargo.lock at line 682 [9.1030385]
B:BD[9.1047789] → [9.1047789:1047808]
```
version = "0.23.0"
```
[9.1047789]
[9.1047808]
```
version = "0.24.0"
```

Replacement in Cargo.lock at line 684 [9.1030385]

B:BD[9.1047873] → [9.1047873:1047951]

checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"

[9.1047873]

[9.1047951]

checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189"

Replacement in Cargo.lock at line 716 [9.1030385]
B:BD[9.1048723] → [2.1797:1815]
```
version = "0.3.2"
```
[9.1048723]
[9.1048741]
```
version = "0.3.3"
```

Replacement in Cargo.lock at line 718 [9.1030385]

B:BD[9.1048806] → [2.1816:1894]

checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00"

[9.1048806]

[9.1048884]

checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726"

Replacement in Cargo.lock at line 770 [9.1030385]
B:BD[9.1049974] → [2.1993:2011]
```
version = "0.4.1"
```
[9.1049974]
[9.1049992]
```
version = "0.4.2"
```

Replacement in Cargo.lock at line 772 [9.1030385]

B:BD[9.1050057] → [2.2012:2090]

checksum = "5dfb77c123b4e2f72a2069aeae0b4b4949cc7e966df277813fc16347e7549737"

[9.1050057]

[9.1050135]

checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9"

Replacement in Cargo.lock at line 781 [9.1030385]
B:BD[9.1050204] → [2.2113:2131]
```
version = "1.4.0"
```
[9.1050204]
[9.1050222]
```
version = "1.4.1"
```

Replacement in Cargo.lock at line 783 [9.1030385]

B:BD[9.1050287] → [2.2132:2210]

checksum = "4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437"

[9.1050287]

[9.1050365]

checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"

Replacement in Cargo.lock at line 920 [9.1030385]
B:BD[9.1053886] → [2.2703:2722]
```
version = "0.3.50"
```
[9.1053886]
[9.1053905]
```
version = "0.3.51"
```

Replacement in Cargo.lock at line 922 [9.1030385]

B:BD[9.1053970] → [2.2723:2801]

checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c"

[9.1053970]

[9.1054048]

checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062"

Replacement in Cargo.lock at line 935 [9.1030385]
B:BD[17.6432] → [16.882:900]
```
version = "0.7.5"
```
[17.6432]
[17.6450]
```
version = "0.7.6"
```

Replacement in Cargo.lock at line 937 [9.1030385]

B:BD[17.6515] → [16.901:979]

checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374"

[17.6515]

[17.6593]

checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"

Replacement in Cargo.lock at line 948 [9.1030385]
B:BD[9.1054747] → [2.2802:2821]
B:BD[9.1054747] → [16.998:1017]
```
version = "0.2.93"
version = "0.2.87"
```
[9.1054747]
[9.1054766]
```
version = "0.2.94"
```

Replacement in Cargo.lock at line 950 [9.1030385]

B:BD[9.1054831] → [2.2822:2900]

B:BD[9.1054831] → [16.1018:1096]

checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
checksum = "265d751d31d6780a3f956bb5b8022feba2d94eeee5a84ba64f4212eedca42213"

[9.1054831]

[9.1054909]

checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"

Deletion in Cargo.lock at line 1002 [9.1030385]
B:BD[9.1055861] → [8.118074:118088]
```
 "twox-hash",
```
Insertion in Cargo.lock at line 1003 [9.1030385]
[17.6739]
[9.1055861]
```
 "twox-hash",
```
Replacement in Cargo.lock at line 1034 [9.1030385]
B:BD[9.1056444] → [9.1056444:1056462]
```
version = "1.1.2"
```
[9.1056444]
[9.1056462]
```
version = "1.1.3"
```

Replacement in Cargo.lock at line 1036 [9.1030385]

B:BD[9.1056527] → [9.1056527:1056605]

checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655"

[9.1056527]

[9.1056605]

checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"

Replacement in Cargo.lock at line 1052 [9.1030385]
B:BD[9.1056895] → [2.3007:3025]
```
version = "0.4.3"
```
[9.1056895]
[9.1056913]
```
version = "0.4.4"
```

Replacement in Cargo.lock at line 1054 [9.1030385]

B:BD[9.1056978] → [2.3026:3104]

checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176"

[9.1056978]

[9.1057056]

checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"

Replacement in Cargo.lock at line 1085 [9.1030385]
B:BD[9.1057767] → [9.1057767:1057785]
```
version = "2.3.4"
```
[9.1057767]
[9.1057785]
```
version = "2.4.0"
```

Replacement in Cargo.lock at line 1087 [9.1030385]

B:BD[9.1057850] → [9.1057850:1057928]

checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"

[9.1057850]

[9.1057928]

checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"

Replacement in Cargo.lock at line 1240 [9.1030385]
B:BD[9.1061523] → [19.155449:155468]
```
version = "0.23.0"
```
[9.1061523]
[9.1061542]
```
version = "0.24.0"
```

Replacement in Cargo.lock at line 1242 [9.1030385]

B:BD[9.1061607] → [19.155469:155547]

checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"

[9.1061607]

[9.1061685]

checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170"

Deletion in Cargo.lock at line 1247 [9.1030385]
B:BD[9.1061717] → [16.1217:1235]
```
version = "1.7.2"
```
Solving an order conflict in Cargo.lock at line 1247 [9.1030385]
[2.3418]
[9.1061735]

Deletion in Cargo.lock at line 1248 [9.1030385]

B:BD[9.1061800] → [2.3419:3497]

checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"

Replacement in Cargo.lock at line 1252 [9.1030385]
B:BD[9.1061908] → [2.3498:3518]
```
version = "0.10.33"
```
[9.1061908]
[9.1061928]
```
version = "0.10.34"
```

Replacement in Cargo.lock at line 1254 [9.1030385]

B:BD[9.1061993] → [2.3519:3597]

checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577"

[9.1061993]

[9.1062071]

checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8"

Replacement in Cargo.lock at line 1272 [9.1030385]
B:BD[9.1062411] → [2.3613:3632]
```
version = "0.9.61"
```
[9.1062411]
[9.1062430]
```
version = "0.9.63"
```

Replacement in Cargo.lock at line 1274 [9.1030385]

B:BD[9.1062495] → [2.3633:3711]

checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f"

[9.1062495]

[9.1062573]

checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98"

Replacement in Cargo.lock at line 1328 [9.1030385]
B:BD[9.1063591] → [2.3712:3736]
```
 "redox_syscall 0.2.6",
```
[9.1063591]
[9.1063609]
```
 "redox_syscall",
```
Deletion in Cargo.lock at line 1434 [9.1030385]
B:BD[9.1065701] → [16.1315:1333]
```
version = "0.2.5"
```
Solving an order conflict in Cargo.lock at line 1434 [9.1030385]
[2.3951]
[32.1392]

Deletion in Cargo.lock at line 1436 [9.1030385]

B:BD[32.1457] → [16.1334:1412]

checksum = "0cf491442e4b033ed1c722cb9f0df5fcfcf4de682466c46469c36bc47dc5548a"

Solving an order conflict in Cargo.lock at line 1436 [9.1030385]
[2.4030]
[32.1535]
Replacement in Cargo.lock at line 1598 [9.1030385]
B:BD[9.1069063] → [9.1069063:1069082]
```
version = "0.1.57"
```
[9.1069063]
[9.1069082]
```
version = "0.2.8"
```

Replacement in Cargo.lock at line 1600 [9.1030385]

B:BD[9.1069147] → [9.1069147:1069238]

B:BD[9.1069238] → [35.2233:2256]

B:BD[35.2256] → [2.4130:4148]

∅:D[2.4148] → [35.2274:2339]

∅:D[36.9279] → [35.2274:2339]

∅:D[19.156387] → [35.2274:2339]

B:BD[35.2274] → [35.2274:2339]

B:BD[35.2339] → [2.4149:4227]

checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]]
name = "redox_syscall"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041"

[9.1069147]

[35.2417]

checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc"

Deletion in Cargo.lock at line 1603 [9.1030385]
B:BD[35.2447] → [35.2447:2462]
∅:D[35.2462] → [9.1069238:1069437]
B:BD[9.1069238] → [9.1069238:1069437]
B:BD[9.1069437] → [23.142351:142372]
B:BD[23.142372] → [35.2463:2488]
∅:D[35.2488] → [9.1069469:1069485]
B:BD[9.1069469] → [9.1069469:1069485]
```
]
[[package]]
name = "redox_users"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
dependencies = [
 "getrandom 0.1.16",
 "redox_syscall 0.1.57",
 "rust-argon2",
```
Replacement in Cargo.lock at line 1612 [9.1030385]
B:BD[19.156487] → [2.4228:4252]
```
 "redox_syscall 0.2.6",
```
[19.156487]
[35.2732]
```
 "redox_syscall",
```
Replacement in Cargo.lock at line 1617 [9.1030385]
B:BD[9.1069515] → [2.4253:4271]
```
version = "1.4.6"
```
[9.1069515]
[9.1069533]
```
version = "1.5.4"
```

Replacement in Cargo.lock at line 1619 [9.1030385]

B:BD[9.1069598] → [2.4272:4350]

checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"

[9.1069598]

[9.1069676]

checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"

Replacement in Cargo.lock at line 1628 [9.1030385]
B:BD[9.1069792] → [2.4351:4370]
```
version = "0.6.23"
```
[9.1069792]
[9.1069811]
```
version = "0.6.25"
```

Replacement in Cargo.lock at line 1630 [9.1030385]

B:BD[9.1069876] → [2.4371:4449]

checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"

[9.1069876]

[9.1069954]

checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"

Deletion in Cargo.lock at line 1686 [9.1030385]
B:BD[9.1071022] → [9.1071022:1071043]
B:BD[9.1071043] → [37.1126:1144]
∅:D[37.1144] → [9.1071061:1071126]
B:BD[9.1071061] → [9.1071061:1071126]
B:BD[9.1071126] → [37.1145:1223]
∅:D[37.1223] → [9.1071204:1071221]
B:BD[9.1071204] → [9.1071204:1071221]
B:BD[9.1071221] → [37.1224:1235]
∅:D[37.1235] → [9.1071232:1071270]
∅:D[32.1736] → [9.1071232:1071270]
B:BD[9.1071232] → [9.1071232:1071270]
B:BD[9.1071270] → [37.1236:1256]
∅:D[37.1256] → [9.1071290:1071305]
∅:D[32.1763] → [9.1071290:1071305]
B:BD[9.1071290] → [9.1071290:1071305]
```
name = "rust-argon2"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
dependencies = [
 "base64",
 "blake2b_simd",
 "constant_time_eq",
 "crossbeam-utils",
]
[[package]]
```
Replacement in Cargo.lock at line 1687 [9.1030385]
B:BD[9.1071329] → [9.1071329:1071348]
```
version = "0.1.18"
```
[9.1071329]
[9.1071348]
```
version = "0.1.19"
```

Replacement in Cargo.lock at line 1689 [9.1030385]

B:BD[9.1071413] → [9.1071413:1071491]

checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"

[9.1071413]

[19.156891]

checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce"

Replacement in Cargo.lock at line 1724 [9.1030385]
B:BD[19.157079] → [8.119248:119266]
```
version = "1.2.4"
```
[19.157079]
[19.157097]
```
version = "1.2.7"
```

Replacement in Cargo.lock at line 1726 [9.1030385]

B:BD[19.157162] → [8.119267:119345]

checksum = "c15b6118bc265955b685bee694a1f04c70dfb65344411495d88e716a2cd74a3b"

[19.157162]

[19.157240]

checksum = "81ad8f3bbfb988e3ce4e5e73ee50f5d5a7f99a5e6dba4123b491feebb5da94d5"

Deletion in Cargo.lock at line 1843 [9.1030385]

B:BD[9.1075391] → [9.1075391:1075404]

B:BD[9.1075404] → [8.119346:119534]


[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

Solving an order conflict in Cargo.lock at line 1845 [9.1030385]
[8.119547]
[17.7234]
Replacement in Cargo.lock at line 1864 [9.1030385]
B:BD[9.1075798] → [2.5141:5160]
```
version = "1.0.70"
```
[9.1075798]
[9.1075817]
```
version = "1.0.72"
```

Replacement in Cargo.lock at line 1866 [9.1030385]

B:BD[9.1075882] → [2.5161:5239]

checksum = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883"

[9.1075882]

[9.1075960]

checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"

Replacement in Cargo.lock at line 1899 [9.1030385]
B:BD[8.119563] → [2.5240:5264]
```
 "redox_syscall 0.2.6",
```
[8.119563]
[9.1076541]
```
 "redox_syscall",
```
Replacement in Cargo.lock at line 1972 [9.1030385]
B:BD[9.1078238] → [2.5265:5284]
```
version = "0.32.8"
```
[9.1078238]
[38.351]
```
version = "0.32.9"
```

Replacement in Cargo.lock at line 1974 [9.1030385]

B:BD[38.416] → [2.5285:5363]

checksum = "139bf84fe168f1af688fb48c586b7eba59ac35684a87b52d973c7bdbc18d9b8f"

[38.416]

[9.1078400]

checksum = "72d58952cd321b79c05e8c999b81ed6094b627157c415679fa297007a4a84da9"

Replacement in Cargo.lock at line 2005 [9.1030385]
B:BD[9.1078612] → [8.119564:119583]
```
version = "0.20.3"
```
[9.1078612]
[9.1078631]
```
version = "0.20.4"
```

Replacement in Cargo.lock at line 2007 [9.1030385]

B:BD[9.1078696] → [8.119584:119662]

checksum = "32214c32e2327f5a7775879390b944396f23ae28f5f2a71bd2f6352dc6d10215"

[9.1078696]

[9.1078774]

checksum = "ca573360d2c7d31df13c747663e69d7210aa732744feeeb808c8889f40934d02"

Replacement in Cargo.lock at line 2136 [9.1030385]
B:BD[9.1081601] → [19.159202:159221]
```
version = "0.1.25"
```
[9.1081601]
[9.1081620]
```
version = "0.1.26"
```

Replacement in Cargo.lock at line 2138 [9.1030385]

B:BD[9.1081685] → [19.159222:159300]

checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"

[9.1081685]

[9.1081763]

checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"

Replacement in Cargo.lock at line 2147 [9.1030385]
B:BD[9.1081881] → [9.1081881:1081900]
```
version = "0.1.17"
```
[9.1081881]
[9.1081900]
```
version = "0.1.18"
```

Replacement in Cargo.lock at line 2149 [9.1030385]

B:BD[9.1081965] → [9.1081965:1082043]

checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"

[9.1081965]

[9.1082043]

checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"

Replacement in Cargo.lock at line 2156 [9.1030385]
B:BD[17.7476] → [16.1792:1810]
```
version = "1.0.1"
```
[17.7476]
[17.7494]
```
version = "3.0.0"
```

Replacement in Cargo.lock at line 2158 [9.1030385]

B:BD[17.7559] → [16.1811:1889]

checksum = "287a760af78a7d607cb231500c06009ea1e0599cd57b10c32760061979bab1f1"

[17.7559]

[17.7637]

checksum = "0687683589ce7d3912e6bf52c1620d970fbed86c27e12118ca779a3780bbf888"

Insertion in Cargo.lock at line 2163 [9.1030385]
[17.7686]
[17.7686]
```
 "once_cell",
```
Replacement in Cargo.lock at line 2222 [9.1030385]
B:BD[9.1083842] → [9.1083842:1083860]
```
version = "0.2.1"
```
[9.1083842]
[9.1083860]
```
version = "0.2.2"
```

Replacement in Cargo.lock at line 2224 [9.1030385]

B:BD[9.1083925] → [9.1083925:1084003]

checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"

[9.1083925]

[9.1084003]

checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"

Replacement in Cargo.lock at line 2228 [9.1030385]
B:BD[9.1084029] → [19.159515:159533]
```
version = "2.2.1"
```
[9.1084029]
[9.1084047]
```
version = "2.2.2"
```

Replacement in Cargo.lock at line 2230 [9.1030385]

B:BD[9.1084112] → [19.159534:159612]

checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"

[9.1084112]

[9.1084190]

checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"

Replacement in Cargo.lock at line 2300 [9.1030385]
B:BD[9.1086008] → [2.6168:6187]
```
version = "0.2.73"
```
[9.1086008]
[9.1086027]
```
version = "0.2.74"
```

Replacement in Cargo.lock at line 2302 [9.1030385]

B:BD[9.1086092] → [2.6188:6266]

checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9"

[9.1086092]

[9.1086170]

checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"

Replacement in Cargo.lock at line 2312 [9.1030385]
B:BD[9.1086298] → [2.6267:6286]
```
version = "0.2.73"
```
[9.1086298]
[9.1086317]
```
version = "0.2.74"
```

Replacement in Cargo.lock at line 2314 [9.1030385]

B:BD[9.1086382] → [2.6287:6365]

checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae"

[9.1086382]

[9.1086460]

checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"

Replacement in Cargo.lock at line 2327 [9.1030385]
B:BD[9.1086616] → [2.6366:6385]
```
version = "0.4.23"
```
[9.1086616]
[9.1086635]
```
version = "0.4.24"
```

Replacement in Cargo.lock at line 2329 [9.1030385]

B:BD[9.1086700] → [2.6386:6464]

checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea"

[9.1086700]

[9.1086778]

checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1"

Replacement in Cargo.lock at line 2339 [9.1030385]
B:BD[9.1086896] → [2.6465:6484]
```
version = "0.2.73"
```
[9.1086896]
[9.1086915]
```
version = "0.2.74"
```

Replacement in Cargo.lock at line 2341 [9.1030385]

B:BD[9.1086980] → [2.6485:6563]

checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f"

[9.1086980]

[9.1087058]

checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"

Replacement in Cargo.lock at line 2349 [9.1030385]
B:BD[9.1087167] → [2.6564:6583]
```
version = "0.2.73"
```
[9.1087167]
[9.1087186]
```
version = "0.2.74"
```

Replacement in Cargo.lock at line 2351 [9.1030385]

B:BD[9.1087251] → [2.6584:6662]

checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"

[9.1087251]

[9.1087329]

checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"

Replacement in Cargo.lock at line 2362 [9.1030385]
B:BD[9.1087473] → [2.6663:6682]
```
version = "0.2.73"
```
[9.1087473]
[9.1087492]
```
version = "0.2.74"
```

Replacement in Cargo.lock at line 2364 [9.1030385]

B:BD[9.1087557] → [2.6683:6761]

checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489"

[9.1087557]

[9.1087635]

checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"

Replacement in Cargo.lock at line 2368 [9.1030385]
B:BD[9.1087665] → [2.6762:6781]
```
version = "0.3.50"
```
[9.1087665]
[9.1087684]
```
version = "0.3.51"
```

Replacement in Cargo.lock at line 2370 [9.1030385]

B:BD[9.1087749] → [2.6782:6860]

checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be"

[9.1087749]

[9.1087827]

checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582"

Conflict resolution

Dependencies

In channels

Change contents

Resurrecting zombie bytes in libpijul/src/working_copy/mod.rs at line 20 [9.198172]

Deletion in libpijul/src/working_copy/mod.rs at line 26 [9.198172]

Resurrecting zombie bytes in libpijul/src/working_copy/mod.rs at line 26 [9.198172]

Solving an order conflict in libpijul/src/working_copy/mod.rs at line 26 [9.198172]

Replacement in libpijul/src/working_copy/mod.rs at line 30 [9.198172]

Deletion in libpijul/src/working_copy/mod.rs at line 55 [9.198172]

Insertion in libpijul/src/vertex_buffer.rs at line 139 [9.217202]

Insertion in libpijul/src/vertex_buffer.rs at line 148 [9.217202]

Insertion in libpijul/src/vertex_buffer.rs at line 202 [9.217202]

Replacement in libpijul/src/vertex_buffer.rs at line 207 [9.217202]

Replacement in libpijul/src/unrecord/working_copy.rs at line 108 [9.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 127 [9.225940]

Deletion in libpijul/src/unrecord/working_copy.rs at line 198 [9.225940]

Solving an order conflict in libpijul/src/unrecord/working_copy.rs at line 198 [9.225940]

File move: text.rs → text.rs.XSEODPNEN2Y2S

Insertion in libpijul/src/tests/mod.rs at line 119 [9.289338]

File move: data → data.XSEODPNEN2Y2S

Solving an order conflict in libpijul/src/record.rs at line 12 [9.488880]

Deletion in libpijul/src/record.rs at line 14 [9.488880]

Insertion in libpijul/src/record.rs at line 541 [9.488880]

Insertion in libpijul/src/record.rs at line 564 [9.488880]

Replacement in libpijul/src/record.rs at line 613 [9.488880]

Insertion in libpijul/src/record.rs at line 656 [9.488880]

Insertion in libpijul/src/record.rs at line 664 [9.488880]

Deletion in libpijul/src/record.rs at line 668 [9.488880]

Resurrecting zombie bytes in libpijul/src/record.rs at line 668 [9.488880]

Solving an order conflict in libpijul/src/record.rs at line 668 [9.488880]

Insertion in libpijul/src/record.rs at line 668 [9.488880]

Replacement in libpijul/src/record.rs at line 670 [9.488880]

Deletion in libpijul/src/record.rs at line 674 [9.488880]

Resurrecting zombie bytes in libpijul/src/record.rs at line 674 [9.488880]

Deletion in libpijul/src/record.rs at line 699 [9.488880]

Resurrecting zombie bytes in libpijul/src/record.rs at line 699 [9.488880]

Replacement in libpijul/src/record.rs at line 700 [9.488880]

Replacement in libpijul/src/record.rs at line 706 [9.488880]

Replacement in libpijul/src/record.rs at line 729 [9.488880]

Deletion in libpijul/src/record.rs at line 801 [9.488880]

Resurrecting zombie bytes in libpijul/src/record.rs at line 801 [9.488880]

Insertion in libpijul/src/record.rs at line 808 [9.488880]

Resurrecting zombie bytes in libpijul/src/record.rs at line 822 [9.488880]

Insertion in libpijul/src/record.rs at line 822 [9.488880]

Deletion in libpijul/src/record.rs at line 852 [9.488880]

Solving an order conflict in libpijul/src/record.rs at line 852 [9.488880]

Insertion in libpijul/src/record.rs at line 852 [9.488880]

Deletion in libpijul/src/record.rs at line 926 [9.488880]

Resurrecting zombie bytes in libpijul/src/record.rs at line 926 [9.488880]

Solving an order conflict in libpijul/src/record.rs at line 926 [9.488880]

Replacement in libpijul/src/record.rs at line 927 [9.488880]

Replacement in libpijul/src/record.rs at line 933 [9.488880]

Replacement in libpijul/src/record.rs at line 985 [9.488880]

Replacement in libpijul/src/record.rs at line 988 [9.488880]

Deletion in libpijul/src/record.rs at line 1419 [9.488880]

Solving an order conflict in libpijul/src/record.rs at line 1419 [9.488880]

Resurrecting zombie bytes in libpijul/src/pristine/sanakirja.rs at line 533 [9.531056]

Insertion in libpijul/src/pristine/sanakirja.rs at line 533 [9.531056]

Deletion in libpijul/src/pristine/sanakirja.rs at line 2265 [9.531056]

Solving an order conflict in libpijul/src/pristine/sanakirja.rs at line 2265 [9.531056]

Deletion in libpijul/src/pristine/inode_metadata.rs at line 8 [9.641569]

Insertion in libpijul/src/pristine/inode_metadata.rs at line 50 [9.641569]

Resurrecting zombie bytes in libpijul/src/diff/replace.rs at line 8 [9.779907]

Solving an order conflict in libpijul/src/diff/replace.rs at line 8 [9.779907]

Resurrecting zombie bytes in libpijul/src/diff/replace.rs at line 83 [9.779907]

Insertion in libpijul/src/diff/replace.rs at line 83 [9.779907]

Replacement in libpijul/src/diff/replace.rs at line 96 [9.779907]

Deletion in libpijul/src/diff/replace.rs at line 361 [9.779907]

Solving an order conflict in libpijul/src/diff/replace.rs at line 361 [9.779907]

Resurrecting zombie bytes in libpijul/src/diff/mod.rs at line 5 [9.793247]

Solving an order conflict in libpijul/src/diff/mod.rs at line 5 [9.793247]

Resurrecting zombie bytes in libpijul/src/diff/delete.rs at line 9 [9.805350]

Solving an order conflict in libpijul/src/diff/delete.rs at line 9 [9.805350]

Resurrecting zombie bytes in libpijul/src/change.rs at line 1 [9.831311]

Resurrecting zombie bytes in libpijul/src/change.rs at line 2 [9.831311]

Resurrecting zombie bytes in libpijul/src/change.rs at line 3 [9.831311]

Solving an order conflict in libpijul/src/change.rs at line 3 [9.831311]

Deletion in libpijul/src/change.rs at line 5 [9.831311]

Resurrecting zombie bytes in libpijul/src/change/text_changes.rs at line 1 [7.37976]