upstream/mercurial-mirror Files · tests/test-absorb-unfinished.t

issue6528: add a config option to control the fixing on the fly...

issue6528: add a config option to control the fixing on the fly This will allow people who know to be safe to avoid any performance overhead (and other potential issue). Differential Revision: https://phab.mercurial-scm.org/D11271

Martin von Zweigbergk - - Load All Authors

File last commit:

r46444:527ce85c default


                r49015:2813d406

5.9rc1 stable

Download file

             test-absorb-unfinished.t
        
                    30 lines
            
             | 797 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-absorb-unfinished.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH << EOF

        > [extensions]

        > absorb=

        > EOF

      Abort absorb if there is an unfinished operation.

        $ hg init abortunresolved

        $ cd abortunresolved

        $ echo "foo1" > foo.whole

        $ hg commit -Aqm "foo 1"

        $ hg update null

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

        $ echo "foo2" > foo.whole

        $ hg commit -Aqm "foo 2"

        $ hg --config extensions.rebase= rebase -r 1 -d 0

        rebasing 1:c3b6dc0e177a tip "foo 2"

        merging foo.whole

        warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')

        unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')

        [240]

        $ hg --config extensions.rebase= absorb

        abort: rebase in progress

        (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')

        [20]

	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

				$ cat >> $HGRCPATH << EOF
				> [extensions]
				> absorb=
				> EOF

				Abort absorb if there is an unfinished operation.

				$ hg init abortunresolved
				$ cd abortunresolved

				$ echo "foo1" > foo.whole
				$ hg commit -Aqm "foo 1"

				$ hg update null
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ echo "foo2" > foo.whole
				$ hg commit -Aqm "foo 2"

				$ hg --config extensions.rebase= rebase -r 1 -d 0
				rebasing 1:c3b6dc0e177a tip "foo 2"
				merging foo.whole
				warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
				unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
				[240]

				$ hg --config extensions.rebase= absorb
				abort: rebase in progress
				(use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
				[20]