upstream/mercurial-mirror Files · contrib/merge-lists/Cargo.toml

obsutil: sort metadata before comparing in geteffectflag()...

obsutil: sort metadata before comparing in geteffectflag() This is probably less important now that we dropped Python 2. We do still support Python 3.6 though, and the dictionaries aren't ordered there either (that was a big change that came with 3.7). Still, maybe it's a good idea to sort metadata explicitly.

Martin von Zweigbergk - - Load All Authors

File last commit:

r51699:337bc83c default


                r52395:a5d8f261

stable

Download file

             Cargo.toml
        
                    21 lines
            
             | 600 B
            
                | application/toml
            
             |
                TOMLLexer
            
             / contrib / merge-lists / Cargo.toml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # A tool that performs a 3-way merge, resolving conflicts in sorted lists and

      # leaving other conflicts unchanged. This is useful with Mercurial's support

      # for partial merge tools (configured in `[partial-merge-tools]`).

      [package]

      name = "merge-lists"

      version = "0.1.0"

      edition = "2021"

      # We need https://github.com/rust-lang/rust/pull/89825

      rust-version = "1.59"

      [dependencies]

      clap = { version = "4.3.17", features = ["derive"] }

      itertools = "0.10.3"

      regex = "1.5.5"

      similar = { version="2.1.0", features = ["bytes"] }

      [dev-dependencies]

      assert_cmd = "2.0.4"

      insta = "1.13.0"

      tempdir = "0.3.7"

	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

				# A tool that performs a 3-way merge, resolving conflicts in sorted lists and
				# leaving other conflicts unchanged. This is useful with Mercurial's support
				# for partial merge tools (configured in `[partial-merge-tools]`).

				[package]
				name = "merge-lists"
				version = "0.1.0"
				edition = "2021"
				# We need https://github.com/rust-lang/rust/pull/89825
				rust-version = "1.59"

				[dependencies]
				clap = { version = "4.3.17", features = ["derive"] }
				itertools = "0.10.3"
				regex = "1.5.5"
				similar = { version="2.1.0", features = ["bytes"] }

				[dev-dependencies]
				assert_cmd = "2.0.4"
				insta = "1.13.0"
				tempdir = "0.3.7"