upstream/mercurial-mirror Files · tests/test-push-checkheads-superceed-A7.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.

av6 - - Load All Authors

File last commit:

r50061:5996640f default


                r52835:73a43fe3

default

Download file

             test-push-checkheads-superceed-A7.t
        
                    105 lines
            
             | 2.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-superceed-A7.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A7...

              r31980
            
      ====================================

      Testing head checking code: Case A-7

      ====================================

      Mercurial checks for the introduction of new heads on push. Evolution comes

      into play to detect if existing branches on the server are being replaced by

      some of the new one we push.

      This case is part of a series of tests checking this behavior.

        av6
    
tests: fix misspelling of supersede...

              r50061
            
      Category A: simple case involving a branch being superseded by another.

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A7...

              r31980
            
      TestCase 7: multi-changeset branch, split on multiple other, (head on its own branch), same number of head

      .. old-state:

      ..

      .. * 2 branch (1-changeset, and 2-changesets)

      ..

      .. new-state:

      ..

        av6
    
tests: fix misspelling of supersede...

              r50061
            
      .. * 1 new branch superseding the head of the old-2-changesets-branch,

      .. * 1 new changesets on the old-1-changeset-branch superseding the base of the other

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A7...

              r31980
            
      ..

      .. expected-result:

      ..

      .. * push allowed

      ..

      .. graph-summary:

      ..

      ..   B ø⇠◔ B'

      ..     | |

      .. A'◔⇢ø |

      ..   | |/

      .. C ● |

      ..    \|

      ..     ●

        $ . $TESTDIR/testlib/push-checkheads-util.sh

      Test setup

      ----------

        $ mkdir A7

        $ cd A7

        $ setuprepos

        creating basic server and client repo

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd server

        $ mkcommit B0

        $ hg up 0

        0 files updated, 0 files merged, 2 files removed, 0 files unresolved

        $ mkcommit C0

        created new head

        $ cd ../client

        $ hg pull

        Matt Harbison
    
tests: remove (glob) annotations that were only for '\' matches...

              r35394
            
        pulling from $TESTTMP/A7/server

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A7...

              r31980
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 2 changes to 2 files (+1 heads)

        Boris Feld
    
phase: report number of non-public changeset alongside the new range...

              r39516
            
        new changesets d73caddc5533:0f88766e02d6 (2 drafts)

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A7...

              r31980
            
        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg up 'desc(C0)'

        1 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ mkcommit A1

        $ hg up 0

        0 files updated, 0 files merged, 2 files removed, 0 files unresolved

        $ mkcommit B1

        created new head

        $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`

        marmoute
    
debugobsolete: also issue the "new obsmarkers" messsage...

              r43163
            
        1 new obsolescence markers

        Boris Feld
    
debugobsolete: also report the number of obsoleted changesets...

              r33542
            
        obsoleted 1 changesets

        Martin von Zweigbergk
    
evolution: report new unstable changesets...

              r35727
            
        1 new orphan changesets

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A7...

              r31980
            
        $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`

        marmoute
    
debugobsolete: also issue the "new obsmarkers" messsage...

              r43163
            
        1 new obsolescence markers

        Boris Feld
    
debugobsolete: also report the number of obsoleted changesets...

              r33542
            
        obsoleted 1 changesets

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A7...

              r31980
            
        $ hg log -G --hidden

        @  25c56d33e4c4 (draft): B1

        |

        | o  a0802eb7fc1b (draft): A1

        | |

        | o  0f88766e02d6 (draft): C0

        |/

        | x  d73caddc5533 (draft): B0

        | |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

      --------------

        $ hg push

        Matt Harbison
    
tests: remove (glob) annotations that were only for '\' matches...

              r35394
            
        pushing to $TESTTMP/A7/server

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A7...

              r31980
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 2 changes to 2 files (+1 heads)

        2 new obsolescence markers

        marmoute
    
obsolete: reports the number of local changeset obsoleted when unbundling...

              r33249
            
        obsoleted 2 changesets

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A7...

              r31980
            
        $ cd ../..

	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

Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A7...	r31980	====================================
		Testing head checking code: Case A-7
		====================================

		Mercurial checks for the introduction of new heads on push. Evolution comes
		into play to detect if existing branches on the server are being replaced by
		some of the new one we push.

		This case is part of a series of tests checking this behavior.

av6 tests: fix misspelling of supersede...	r50061	Category A: simple case involving a branch being superseded by another.
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A7...	r31980	TestCase 7: multi-changeset branch, split on multiple other, (head on its own branch), same number of head

		.. old-state:
		..
		.. * 2 branch (1-changeset, and 2-changesets)
		..
		.. new-state:
		..
av6 tests: fix misspelling of supersede...	r50061	.. * 1 new branch superseding the head of the old-2-changesets-branch,
		.. * 1 new changesets on the old-1-changeset-branch superseding the base of the other
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A7...	r31980	..
		.. expected-result:
		..
		.. * push allowed
		..
		.. graph-summary:
		..
		.. B ø⇠◔ B'
		.. \| \|
		.. A'◔⇢ø \|
		.. \| \|/
		.. C ● \|
		.. \\|
		.. ●

		$ . $TESTDIR/testlib/push-checkheads-util.sh

		Test setup
		----------

		$ mkdir A7
		$ cd A7
		$ setuprepos
		creating basic server and client repo
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd server
		$ mkcommit B0
		$ hg up 0
		0 files updated, 0 files merged, 2 files removed, 0 files unresolved
		$ mkcommit C0
		created new head
		$ cd ../client
		$ hg pull
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pulling from $TESTTMP/A7/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A7...	r31980	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 2 files (+1 heads)
Boris Feld phase: report number of non-public changeset alongside the new range...	r39516	new changesets d73caddc5533:0f88766e02d6 (2 drafts)
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A7...	r31980	(run 'hg heads' to see heads, 'hg merge' to merge)
		$ hg up 'desc(C0)'
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkcommit A1
		$ hg up 0
		0 files updated, 0 files merged, 2 files removed, 0 files unresolved
		$ mkcommit B1
		created new head
		$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
marmoute debugobsolete: also issue the "new obsmarkers" messsage...	r43163	1 new obsolescence markers
Boris Feld debugobsolete: also report the number of obsoleted changesets...	r33542	obsoleted 1 changesets
Martin von Zweigbergk evolution: report new unstable changesets...	r35727	1 new orphan changesets
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A7...	r31980	$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
marmoute debugobsolete: also issue the "new obsmarkers" messsage...	r43163	1 new obsolescence markers
Boris Feld debugobsolete: also report the number of obsoleted changesets...	r33542	obsoleted 1 changesets
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A7...	r31980	$ hg log -G --hidden
		@ 25c56d33e4c4 (draft): B1
		\|
		\| o a0802eb7fc1b (draft): A1
		\| \|
		\| o 0f88766e02d6 (draft): C0
		\|/
		\| x d73caddc5533 (draft): B0
		\| \|
		\| x 8aaa48160adc (draft): A0
		\|/
		o 1e4be0697311 (public): root


		Actual testing
		--------------

		$ hg push
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pushing to $TESTTMP/A7/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A7...	r31980	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 2 files (+1 heads)
		2 new obsolescence markers
marmoute obsolete: reports the number of local changeset obsoleted when unbundling...	r33249	obsoleted 2 changesets
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A7...	r31980
		$ cd ../..