upstream/mercurial-mirror Files · tests/test-merge4.t

pager: set some environment variables if they're not set...

pager: set some environment variables if they're not set Git did this already [1] [2]. We want this behavior too [3]. This provides a better default user experience (like, supporting colors) if users have things like "PAGER=less" set, which is not uncommon. The environment variables are provided by a method so extensions can override them on demand. [1]: https://github.com/git/git/blob/6a5ff7acb5965718cc7016c0ab6c601454fd7cde/pager.c#L87 [2]: https://github.com/git/git/blob/6a5ff7acb5965718cc7016c0ab6c601454fd7cde/Makefile#L1545 [3]: https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-March/094780.html

Patrick Mezard - - Load All Authors

File last commit:

r16536:63c817ea stable


                r31954:e518192d

default

Download file

             test-merge4.t
        
                    25 lines
            
             | 654 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge4.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo This is file a1 > a

        $ hg add a

        $ hg commit -m "commit #0"

        $ echo This is file b1 > b

        $ hg add b

        $ hg commit -m "commit #1"

        $ hg update 0

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

        $ echo This is file c1 > c

        $ hg add c

        $ hg commit -m "commit #2"

        created new head

        $ hg merge 1

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

        (branch merge, don't forget to commit)

        $ rm b

        $ echo This is file c22 > c

      Test hg behaves when committing with a missing file added by a merge

        $ hg commit -m "commit #3"

        abort: cannot commit merge with missing files

        [255]

	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

				$ hg init
				$ echo This is file a1 > a
				$ hg add a
				$ hg commit -m "commit #0"
				$ echo This is file b1 > b
				$ hg add b
				$ hg commit -m "commit #1"
				$ hg update 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ echo This is file c1 > c
				$ hg add c
				$ hg commit -m "commit #2"
				created new head
				$ hg merge 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ rm b
				$ echo This is file c22 > c

				Test hg behaves when committing with a missing file added by a merge

				$ hg commit -m "commit #3"
				abort: cannot commit merge with missing files
				[255]