upstream/mercurial-mirror Files · tests/test-push-checkheads-unpushed-D6.t

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Pierre-Yves David - - Load All Authors

File last commit:

r31989:85a22bc0 default


                r32255:7e35d31b

default

Download file

             test-push-checkheads-unpushed-D6.t
        
                    82 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-unpushed-D6.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing head checking code: Case D-6

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

      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 D: remote head is "obs-affected" locally, but result is not part of the push

      TestCase 6: single changeset, superseeded then pruned (on a new changeset unpushed) changeset

      This is a partial push variation of case B-6

      .. old-state:

      ..

      .. * 1 changeset branch

      ..

      .. new-state:

      ..

      .. * old branch is rewritten onto another one,

      .. * the new version is then pruned.

      ..

      .. expected-result:

      ..

      .. * push denied

      ..

      .. graph-summary:

      ..

      ..   A ø⇠⊗ A'

      ..     | |

      .. C ◔ | ○ B

      ..    \|/

      ..     ●

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

      Test setup

      ----------

        $ mkdir D6

        $ cd D6

        $ 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 '0'

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

        $ mkcommit C0

        created new head

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

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

        $ hg log -G --hidden

        @  0f88766e02d6 (draft): C0

        |

        | x  ba93660aff8d (draft): A1

        | |

        | o  74ff5441d343 (draft): B0

        |/

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

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

        pushing to $TESTTMP/D6/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 D-6
				====================================

				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 D: remote head is "obs-affected" locally, but result is not part of the push
				TestCase 6: single changeset, superseeded then pruned (on a new changeset unpushed) changeset

				This is a partial push variation of case B-6

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

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

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

				$ mkdir D6
				$ cd D6
				$ 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 '0'
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ mkcommit C0
				created new head
				$ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
				$ hg debugobsolete --record-parents `getid "desc(A1)"`
				$ hg log -G --hidden
				@ 0f88766e02d6 (draft): C0
				\|
				\| x ba93660aff8d (draft): A1
				\| \|
				\| o 74ff5441d343 (draft): B0
				\|/
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


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

				$ hg push --rev 'desc(C0)'
				pushing to $TESTTMP/D6/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 ../..