upstream/mercurial-mirror Files · tests/test-push-checkheads-pruned-B7.t

obsolete: closest divergent support...

obsolete: closest divergent support Add a closest argument to successorssets changing the definition of latest successors. With "closest=false" (current behavior), latest successors are "leafs" on the obsmarker graph. They don't have any successor and are known locally. With "closest=true", latest successors are the closest locally-known changesets that are visible in the repository or repoview. Closest successors can be then obsolete, orphan. This will be used in a later patch to show the closest successor of changesets with the successorssets template.

marmoute - - Load All Authors

File last commit:

r33249:53b3a196 default


                r33274:68f3e819

default

Download file

             test-push-checkheads-pruned-B7.t
        
                    78 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-pruned-B7.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing head checking code: Case B-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.

      Category B: simple case involving pruned changesets

      TestCase 7: single changesets, pruned then superseeded (on an existing changeset)

      .. old-state:

      ..

      .. * 1 changeset branch

      ..

      .. new-state:

      ..

      .. * old branch is rewritten onto the common set,

      .. * the new version is then pruned.

      ..

      .. expected-result:

      ..

      .. * push allowed

      ..

      .. graph-summary:

      ..

      ..   A ø⇠⊗ A'

      .. B ◔ | |

      ..    \|/

      ..     ●

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

      Test setup

      ----------

        $ mkdir B7

        $ cd B7

        $ setuprepos

        creating basic server and client repo

        updating to branch default

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

        $ cd client

        $ hg up 0

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

        $ mkcommit B0

        created new head

        $ mkcommit A1

        $ hg up 'desc(B0)'

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

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

        $ hg debugobsolete --record-parents `getid "desc(A1)"`

        $ hg log -G --hidden

        x  ba93660aff8d (draft): A1

        |

        @  74ff5441d343 (draft): B0

        |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

        $ hg push

        pushing to $TESTTMP/B7/server (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        2 new obsolescence markers

        obsoleted 1 changesets

        $ 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

				====================================
				Testing head checking code: Case B-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.

				Category B: simple case involving pruned changesets
				TestCase 7: single changesets, pruned then superseeded (on an existing changeset)

				.. old-state:
				..
				.. * 1 changeset branch
				..
				.. new-state:
				..
				.. * old branch is rewritten onto the common set,
				.. * the new version is then pruned.
				..
				.. expected-result:
				..
				.. * push allowed
				..
				.. graph-summary:
				..
				.. A ø⇠⊗ A'
				.. B ◔ \| \|
				.. \\|/
				.. ●

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

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

				$ mkdir B7
				$ cd B7
				$ setuprepos
				creating basic server and client repo
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd client
				$ hg up 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkcommit B0
				created new head
				$ mkcommit A1
				$ hg up 'desc(B0)'
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
				$ hg debugobsolete --record-parents `getid "desc(A1)"`
				$ hg log -G --hidden
				x ba93660aff8d (draft): A1
				\|
				@ 74ff5441d343 (draft): B0
				\|
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


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

				$ hg push
				pushing to $TESTTMP/B7/server (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				2 new obsolescence markers
				obsoleted 1 changesets

				$ cd ../..