upstream/mercurial-mirror Files · tests/test-issue4074.t

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.

Matt Mackall - - Load All Authors

File last commit:

r29014:f1ca2496 stable


                r32255:7e35d31b

default

Download file

             test-issue4074.t
        
                    29 lines
            
             | 506 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue4074.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require no-pure

      A script to generate nasty diff worst-case scenarios:

        $ cat > s.py <<EOF

        > import random

        > for x in xrange(100000):

        >     print

        >     if random.randint(0, 100) >= 50:

        >         x += 1

        >     print hex(x)

        > EOF

        $ hg init a

        $ cd a

      Check in a big file:

        $ python ../s.py > a

        $ hg ci -qAm0

      Modify it:

        $ python ../s.py > a

      Time a check-in, should never take more than 10 seconds user time:

        $ hg ci --time -m1

        time: real .* secs .user [0-9][.].* sys .* (re)

	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

				#require no-pure

				A script to generate nasty diff worst-case scenarios:

				$ cat > s.py <<EOF
				> import random
				> for x in xrange(100000):
				> print
				> if random.randint(0, 100) >= 50:
				> x += 1
				> print hex(x)
				> EOF

				$ hg init a
				$ cd a

				Check in a big file:

				$ python ../s.py > a
				$ hg ci -qAm0

				Modify it:

				$ python ../s.py > a

				Time a check-in, should never take more than 10 seconds user time:

				$ hg ci --time -m1
				time: real .* secs .user [0-9][.].* sys .* (re)