upstream/mercurial-mirror Files · tests/test-absorb-strip.t

tests: drop files from exclusion list in test-check-module-imports.t...

tests: drop files from exclusion list in test-check-module-imports.t Now, these files has no style issue at checking with import-checker.py. BTW, tests/test-imports-checker.t is still excluded, because almost all code fragments in it has intentional importing style violation. Using NO_CHECK_EOF instead of EOF as heredoc limit mark can make import-checker.py ignore such fragments. But keeping these fragments checkable seems still useful: for example, test-imports-checker.t can be used to test whether import-checker.py can detect erroneous code fragment in test script as expected.

Mark Thomas - - Load All Authors

File last commit:

r40226:31dfa7da default


                r40243:f9e3044d

default

Download file

             test-absorb-strip.t
        
                    45 lines
            
             | 579 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-absorb-strip.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits

        $ cat >> $HGRCPATH << EOF

        > [extensions]

        > absorb=

        > drawdag=$TESTDIR/drawdag.py

        > EOF

        $ hg init

        $ hg debugdrawdag << EOF

        > E

        > |

        > D F

        > |/

        > C

        > |

        > B

        > |

        > A

        > EOF

        $ hg up E -q

        $ echo 1 >> B

        $ echo 2 >> D

        $ hg absorb -a

        saved backup bundle to * (glob)

        2 of 2 chunk(s) applied

        $ hg log -G -T '{desc}'

        @  E

        |

        o  D

        |

        o  C

        |

        o  B

        |

        | o  F

        | |

        | o  C

        | |

        | o  B

        |/

        o  A

	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

				Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits

				$ cat >> $HGRCPATH << EOF
				> [extensions]
				> absorb=
				> drawdag=$TESTDIR/drawdag.py
				> EOF

				$ hg init
				$ hg debugdrawdag << EOF
				> E
				> \|
				> D F
				> \|/
				> C
				> \|
				> B
				> \|
				> A
				> EOF

				$ hg up E -q
				$ echo 1 >> B
				$ echo 2 >> D
				$ hg absorb -a
				saved backup bundle to * (glob)
				2 of 2 chunk(s) applied

				$ hg log -G -T '{desc}'
				@ E
				\|
				o D
				\|
				o C
				\|
				o B
				\|
				\| o F
				\| \|
				\| o C
				\| \|
				\| o B
				\|/
				o A