upstream/mercurial-mirror Files · tests/test-push-checkheads-partial-C4.t

histedit: make check for unresolved conflicts explicit (issue5545)...

histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.

Pierre-Yves David - - Load All Authors

File last commit:

r31985:7906cdb6 default


                r32057:e5ffc91a

stable

Download file

             test-push-checkheads-partial-C4.t
        
                    82 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-partial-C4.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing head checking code: Case C-4

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

      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 C: case were the branch is only partially obsoleted

      TestCase 4: 2 changeset branch, only the base is pruned

      .. old-state:

      ..

      .. * 2 changeset branch

      ..

      .. new-state:

      ..

      .. * old base is pruned

      .. * 1 new unrelated branch

      ..

      .. expected-result:

      ..

      .. * push denied

      ..

      .. graph-summary:

      ..

      ..   B ◔

      ..     |

      ..   A ⊗ ◔ C

      ..     |/

      ..     ●

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

      Test setup

      ----------

        $ mkdir C4

        $ cd C4

        $ 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

        $ cd ../client

        $ hg pull

        pulling from $TESTTMP/C4/server (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        (run 'hg update' to get a working copy)

        $ hg up 0

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

        $ mkcommit C0

        created new head

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

        $ hg log -G --hidden

        @  0f88766e02d6 (draft): C0

        |

        | o  d73caddc5533 (draft): B0

        | |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

        $ hg push --rev 'desc(C0)'

        pushing to $TESTTMP/C4/server (glob)

        searching for changes

        abort: push creates new remote head 0f88766e02d6!

        (merge or see 'hg help push' for details about pushing new heads)

        [255]

        $ 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 C-4
				====================================

				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 C: case were the branch is only partially obsoleted
				TestCase 4: 2 changeset branch, only the base is pruned

				.. old-state:
				..
				.. * 2 changeset branch
				..
				.. new-state:
				..
				.. * old base is pruned
				.. * 1 new unrelated branch
				..
				.. expected-result:
				..
				.. * push denied
				..
				.. graph-summary:
				..
				.. B ◔
				.. \|
				.. A ⊗ ◔ C
				.. \|/
				.. ●

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

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

				$ mkdir C4
				$ cd C4
				$ 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
				$ cd ../client
				$ hg pull
				pulling from $TESTTMP/C4/server (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)
				$ hg up 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkcommit C0
				created new head
				$ hg debugobsolete --record-parents `getid "desc(A0)"`
				$ hg log -G --hidden
				@ 0f88766e02d6 (draft): C0
				\|
				\| o d73caddc5533 (draft): B0
				\| \|
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


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

				$ hg push --rev 'desc(C0)'
				pushing to $TESTTMP/C4/server (glob)
				searching for changes
				abort: push creates new remote head 0f88766e02d6!
				(merge or see 'hg help push' for details about pushing new heads)
				[255]

				$ cd ../..