upstream/mercurial-mirror Files · rust/hg-core/Cargo.toml

filemerge: when merge tool uses $output, don't leave markers in $local...

filemerge: when merge tool uses $output, don't leave markers in $local As explained in the previous patch, we incorrectly leave conflict markers in both `$local` and `$output` since D12190. I don't understand why it broke but the fix is simple and clear after all the recent refactoring. Differential Revision: https://phab.mercurial-scm.org/D12379

Raphaël Gomès - - Load All Authors

File last commit:

r49808:ec8d9b5a default


                r49823:a54a8663

stable

Download file

             Cargo.toml
        
                    47 lines
            
             | 1.0 KiB
            
                | application/toml
            
             |
                TOMLLexer
            
             / rust / hg-core / Cargo.toml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      [package]

      name = "hg-core"

      version = "0.1.0"

      authors = ["Georges Racinet <gracinet@anybox.fr>"]

      description = "Mercurial pure Rust core library, with no assumption on Python bindings (FFI)"

      edition = "2018"

      [lib]

      name = "hg"

      [dependencies]

      bitflags = "1.2"

      bytes-cast = "0.2"

      byteorder = "1.3.4"

      derive_more = "0.99"

      home = "0.5"

      im-rc = "15.0.*"

      itertools = "0.9"

      lazy_static = "1.4.0"

      libc = "0.2"

      rand = "0.8.4"

      rand_pcg = "0.3.1"

      rand_distr = "0.4.2"

      rayon = "1.3.0"

      regex = "1.3.9"

      sha-1 = "0.9.6"

      twox-hash = "1.5.0"

      same-file = "1.0.6"

      stable_deref_trait = "1.2.0"

      tempfile = "3.1.0"

      crossbeam-channel = "0.4"

      micro-timer = "0.3.0"

      log = "0.4.8"

      memmap2 = {version = "0.4", features = ["stable_deref_trait"]}

      zstd = "0.5.3"

      format-bytes = "0.3.0"

      # We don't use the `miniz-oxide` backend to not change rhg benchmarks and until

      # we have a clearer view of which backend is the fastest.

      [dependencies.flate2]

      version = "1.0.16"

      features = ["zlib"]

      default-features = false

      [dev-dependencies]

      clap = "*"

      pretty_assertions = "0.6.1"

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				[package]
				name = "hg-core"
				version = "0.1.0"
				authors = ["Georges Racinet <gracinet@anybox.fr>"]
				description = "Mercurial pure Rust core library, with no assumption on Python bindings (FFI)"
				edition = "2018"

				[lib]
				name = "hg"

				[dependencies]
				bitflags = "1.2"
				bytes-cast = "0.2"
				byteorder = "1.3.4"
				derive_more = "0.99"
				home = "0.5"
				im-rc = "15.0.*"
				itertools = "0.9"
				lazy_static = "1.4.0"
				libc = "0.2"
				rand = "0.8.4"
				rand_pcg = "0.3.1"
				rand_distr = "0.4.2"
				rayon = "1.3.0"
				regex = "1.3.9"
				sha-1 = "0.9.6"
				twox-hash = "1.5.0"
				same-file = "1.0.6"
				stable_deref_trait = "1.2.0"
				tempfile = "3.1.0"
				crossbeam-channel = "0.4"
				micro-timer = "0.3.0"
				log = "0.4.8"
				memmap2 = {version = "0.4", features = ["stable_deref_trait"]}
				zstd = "0.5.3"
				format-bytes = "0.3.0"

				# We don't use the `miniz-oxide` backend to not change rhg benchmarks and until
				# we have a clearer view of which backend is the fastest.
				[dependencies.flate2]
				version = "1.0.16"
				features = ["zlib"]
				default-features = false

				[dev-dependencies]
				clap = "*"
				pretty_assertions = "0.6.1"