upstream/mercurial-mirror Files · tests/test-merge-halt.t

filemerge: introduce functions to halt merge flow...

filemerge: introduce functions to halt merge flow Depends on D931. This patch introduces functions and a config option that will allow a user to halt the merge if there are failures during a file merge. These functions will be used in the next patch. Differential Revision: https://phab.mercurial-scm.org/D932

Ryan McElroy - - Load All Authors

File last commit:

r34680:143337bc default


                r34797:ed91846c

default

Download file

             test-merge-halt.t
        
                    78 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-halt.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > [phases]

        > publish=False

        > [merge]

        > EOF

        $ hg init repo

        $ cd repo

        $ echo a > a

        $ echo b > b

        $ hg commit -qAm ab

        $ echo c >> a

        $ echo c >> b

        $ hg commit -qAm c

        $ hg up -q ".^"

        $ echo d >> a

        $ echo d >> b

        $ hg commit -qAm d

      Testing on-failure=continue

        $ echo on-failure=continue >> $HGRCPATH

        $ hg rebase -s 1 -d 2 --tool false

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        merging a failed!

        merging b failed!

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

        [1]

        $ hg resolve --list

        U a

        U b

        $ hg rebase --abort

        rebase aborted

      Testing on-failure=halt

        $ echo on-failure=halt >> $HGRCPATH

        $ hg rebase -s 1 -d 2 --tool false

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        merging a failed!

        merging b failed!

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

        [1]

        $ hg resolve --list

        U a

        U b

        $ hg rebase --abort

        rebase aborted

      Testing on-failure=prompt

        $ echo on-failure=prompt >> $HGRCPATH

        $ cat <<EOS | hg rebase -s 1 -d 2 --tool false --config ui.interactive=1

        > y

        > n

        > EOS

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        merging a failed!

        merging b failed!

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

        [1]

        $ hg resolve --list

        U a

        U b

        $ hg rebase --abort

        rebase aborted

	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]
				> rebase=
				> [phases]
				> publish=False
				> [merge]
				> EOF

				$ hg init repo
				$ cd repo
				$ echo a > a
				$ echo b > b
				$ hg commit -qAm ab
				$ echo c >> a
				$ echo c >> b
				$ hg commit -qAm c
				$ hg up -q ".^"
				$ echo d >> a
				$ echo d >> b
				$ hg commit -qAm d

				Testing on-failure=continue
				$ echo on-failure=continue >> $HGRCPATH
				$ hg rebase -s 1 -d 2 --tool false
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				merging a failed!
				merging b failed!
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted

				Testing on-failure=halt
				$ echo on-failure=halt >> $HGRCPATH
				$ hg rebase -s 1 -d 2 --tool false
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				merging a failed!
				merging b failed!
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted

				Testing on-failure=prompt
				$ echo on-failure=prompt >> $HGRCPATH
				$ cat <<EOS \| hg rebase -s 1 -d 2 --tool false --config ui.interactive=1
				> y
				> n
				> EOS
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				merging a failed!
				merging b failed!
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted