upstream/mercurial-mirror Files · tests/test-push-checkheads-multibranches-E3.t

rhg: add resolve_file_args to path_utils.rs...

rhg: add resolve_file_args to path_utils.rs Extracted logic for resolving `FILE ...` arguments from cat.rs into a new function in path_utils.rs. I plan to use this for rhg annotate. I tried to reuse hg::utils::files::canonical_path instead, but that didn't work. For example it reports a InsideDotHg error for any path containing "..".

Martin von Zweigbergk - - Load All Authors

File last commit:

r46735:9261f6c1 default


                r53438:f33f37ac

tip default

Download file

             test-push-checkheads-multibranches-E3.t
        
                    94 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-multibranches-E3.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marmoute
    
discovery: avoid wrong detection of multiple branch heads (issue6256)...

              r44949
            
      ====================================

      Testing head checking code: Case E-3

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

      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 E: case involving changeset on multiple branch

      TestCase 8: moving only part of the interleaved branch away, creating 2 heads

      .. old-state:

      ..

      .. * 2-changeset on branch default

      .. * 1-changeset on branch Z (between the two other)

      ..

      .. new-state:

      ..

      .. * 2-changeset on branch default, on untouched, the other moved

      .. * 1-changeset on branch Z (at the same location)

      ..

      .. expected-result:

      ..

      .. * push rejected

      ..

      .. graph-summary:

      ..

      ..   C ø⇠◔ C'

      ..     | |

      ..   B ◔ |

      ..     | |

      ..   A ◔ |

      ..     |/

      ..     ●

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

      Test setup

      ----------

        $ mkdir E1

        $ cd E1

        $ 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 branch Z

        marked working directory as branch Z

        (branches are permanent and global, did you want a bookmark?)

        $ mkcommit B0

        $ hg branch default --force

        marked working directory as branch default

        $ mkcommit C0

        created new head

        $ hg push --new-branch

        pushing to $TESTTMP/E1/server

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 2 changes to 2 files

        $ hg up 0

        0 files updated, 0 files merged, 3 files removed, 0 files unresolved

        $ mkcommit C1

        created new head

        $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"`

        1 new obsolescence markers

        obsoleted 1 changesets

        $ hg log -G --hidden

        @  dc44c53142f0 (draft): C1

        |

        | x  afc55ba2ce61 (draft): C0

        | |

        | o  93e5c1321ece (draft): B0

        | |

        | o  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

        $ hg push -r 'desc("C1")'

        pushing to $TESTTMP/E1/server

        searching for changes

        Martin von Zweigbergk
    
errors: remove trailing "!" in messages about creating new heads on push...

              r46520
            
        abort: push creates new remote head dc44c53142f0

        marmoute
    
discovery: avoid wrong detection of multiple branch heads (issue6256)...

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

        Martin von Zweigbergk
    
errors: raise StateError when push fails because it creates new heads...

              r46735
            
        [20]

        marmoute
    
discovery: avoid wrong detection of multiple branch heads (issue6256)...

              r44949
            
        $ 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

marmoute discovery: avoid wrong detection of multiple branch heads (issue6256)...	r44949	====================================
		Testing head checking code: Case E-3
		====================================

		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 E: case involving changeset on multiple branch
		TestCase 8: moving only part of the interleaved branch away, creating 2 heads

		.. old-state:
		..
		.. * 2-changeset on branch default
		.. * 1-changeset on branch Z (between the two other)
		..
		.. new-state:
		..
		.. * 2-changeset on branch default, on untouched, the other moved
		.. * 1-changeset on branch Z (at the same location)
		..
		.. expected-result:
		..
		.. * push rejected
		..
		.. graph-summary:
		..
		.. C ø⇠◔ C'
		.. \| \|
		.. B ◔ \|
		.. \| \|
		.. A ◔ \|
		.. \|/
		.. ●

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

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

		$ mkdir E1
		$ cd E1
		$ 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 branch Z
		marked working directory as branch Z
		(branches are permanent and global, did you want a bookmark?)
		$ mkcommit B0
		$ hg branch default --force
		marked working directory as branch default
		$ mkcommit C0
		created new head
		$ hg push --new-branch
		pushing to $TESTTMP/E1/server
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 2 files
		$ hg up 0
		0 files updated, 0 files merged, 3 files removed, 0 files unresolved
		$ mkcommit C1
		created new head
		$ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"`
		1 new obsolescence markers
		obsoleted 1 changesets
		$ hg log -G --hidden
		@ dc44c53142f0 (draft): C1
		\|
		\| x afc55ba2ce61 (draft): C0
		\| \|
		\| o 93e5c1321ece (draft): B0
		\| \|
		\| o 8aaa48160adc (draft): A0
		\|/
		o 1e4be0697311 (public): root


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

		$ hg push -r 'desc("C1")'
		pushing to $TESTTMP/E1/server
		searching for changes
Martin von Zweigbergk errors: remove trailing "!" in messages about creating new heads on push...	r46520	abort: push creates new remote head dc44c53142f0
marmoute discovery: avoid wrong detection of multiple branch heads (issue6256)...	r44949	(merge or see 'hg help push' for details about pushing new heads)
Martin von Zweigbergk errors: raise StateError when push fails because it creates new heads...	r46735	[20]
marmoute discovery: avoid wrong detection of multiple branch heads (issue6256)...	r44949
		$ cd ../..