upstream/mercurial-mirror Files · tests/bundles/remote.sh

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Olle Lundberg - - Load All Authors

File last commit:

r20832:5d57b210 default


                r32255:7e35d31b

default

Download file

             remote.sh
        
                    32 lines
            
             | 520 B
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / bundles / remote.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env bash

      hg init remote

      cd remote

      echo "0" >> afile

      hg add afile

      hg commit -m "0.0"

      echo "1" >> afile

      hg commit -m "0.1"

      echo "2" >> afile

      hg commit -m "0.2"

      echo "3" >> afile

      hg commit -m "0.3"

      hg update -C 0

      echo "1" >> afile

      hg commit -m "1.1"

      echo "2" >> afile

      hg commit -m "1.2"

      echo "a line" > fred

      echo "3" >> afile

      hg add fred

      hg commit -m "1.3"

      hg mv afile adifferentfile

      hg commit -m "1.3m"

      hg update -C 3

      hg mv afile anotherfile

      hg commit -m "0.3m"

      hg bundle -a ../remote.hg

      cd ..

      rm -Rf remote

	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

				#!/usr/bin/env bash
				hg init remote
				cd remote

				echo "0" >> afile
				hg add afile
				hg commit -m "0.0"
				echo "1" >> afile
				hg commit -m "0.1"
				echo "2" >> afile
				hg commit -m "0.2"
				echo "3" >> afile
				hg commit -m "0.3"
				hg update -C 0
				echo "1" >> afile
				hg commit -m "1.1"
				echo "2" >> afile
				hg commit -m "1.2"
				echo "a line" > fred
				echo "3" >> afile
				hg add fred
				hg commit -m "1.3"
				hg mv afile adifferentfile
				hg commit -m "1.3m"
				hg update -C 3
				hg mv afile anotherfile
				hg commit -m "0.3m"

				hg bundle -a ../remote.hg

				cd ..
				rm -Rf remote