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

tests: use pattern matching to mask `ECONNREFUSED` messages...

tests: use pattern matching to mask `ECONNREFUSED` messages The second and third one of these in `test-http-proxy.t` was failing on Windows. The others were found by grep and by failed tests when output was matched and an attempt was made to emit the mask pattern. The first clonebundles failure on Windows emitted: error fetching bundle: [WinError 10061] $ECONNREFUSED$ We should probably stringify that better to get rid of the "[WinError 10061]" part.

Martin von Zweigbergk - - Load All Authors

File last commit:

r41978:c91321e8 default


                r52835:73a43fe3

default

Download file

             test-absorb-strip.t
        
                    46 lines
            
             | 662 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

        warning: orphaned descendants detected, not stripping 112478962961, 26805aba1e60

        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
				warning: orphaned descendants detected, not stripping 112478962961, 26805aba1e60
				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