upstream/mercurial-mirror Files · tests/test-merge-internal-tools-pattern.t

merge: move dr/rd warning messages out of applyupdates()...

merge: move dr/rd warning messages out of applyupdates() As preparation for making 'dr' and 'rd' actions no longer actions, move the reporting from applyupdates() to its caller update(). This way we won't have to pass additonal arguments to applyupdates() when they are no longer actions. Also, the warnings are equally unrelated to applyupdates() as they are to recordupdates(), as they don't result in any changes to either the working copy or the dirstate. See earlier patch for additional motivation.

Matt Mackall - - Load All Authors

File last commit:

r12328:b63f6422 default


                r23525:5126d771

default

Download file

             test-merge-internal-tools-pattern.t
        
                    112 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-internal-tools-pattern.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Make sure that the internal merge tools (internal:fail, internal:local, and

      internal:other) are used when matched by a merge-pattern in hgrc

      Make sure HGMERGE doesn't interfere with the test:

        $ unset HGMERGE

        $ hg init

      Initial file contents:

        $ echo "line 1" > f

        $ echo "line 2" >> f

        $ echo "line 3" >> f

        $ hg ci -Am "revision 0"

        adding f

        $ cat f

        line 1

        line 2

        line 3

      Branch 1: editing line 1:

        $ sed 's/line 1/first line/' f > f.new

        $ mv f.new f

        $ hg ci -Am "edited first line"

      Branch 2: editing line 3:

        $ hg update 0

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

        $ sed 's/line 3/third line/' f > f.new

        $ mv f.new f

        $ hg ci -Am "edited third line"

        created new head

      Merge using internal:fail tool:

        $ echo "[merge-patterns]" > .hg/hgrc

        $ echo "* = internal:fail" >> .hg/hgrc

        $ hg merge

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

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

        $ cat f

        line 1

        line 2

        third line

        $ hg stat

        M f

      Merge using internal:local tool:

        $ hg update -C 2

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

        $ sed 's/internal:fail/internal:local/' .hg/hgrc > .hg/hgrc.new

        $ mv .hg/hgrc.new .hg/hgrc

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ cat f

        line 1

        line 2

        third line

        $ hg stat

        M f

      Merge using internal:other tool:

        $ hg update -C 2

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

        $ sed 's/internal:local/internal:other/' .hg/hgrc > .hg/hgrc.new

        $ mv .hg/hgrc.new .hg/hgrc

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ cat f

        first line

        line 2

        line 3

        $ hg stat

        M f

      Merge using default tool:

        $ hg update -C 2

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

        $ rm .hg/hgrc

        $ hg merge

        merging f

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

        (branch merge, don't forget to commit)

        $ cat f

        first line

        line 2

        third line

        $ hg stat

        M f

	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

				Make sure that the internal merge tools (internal:fail, internal:local, and
				internal:other) are used when matched by a merge-pattern in hgrc

				Make sure HGMERGE doesn't interfere with the test:

				$ unset HGMERGE

				$ hg init

				Initial file contents:

				$ echo "line 1" > f
				$ echo "line 2" >> f
				$ echo "line 3" >> f
				$ hg ci -Am "revision 0"
				adding f

				$ cat f
				line 1
				line 2
				line 3

				Branch 1: editing line 1:

				$ sed 's/line 1/first line/' f > f.new
				$ mv f.new f
				$ hg ci -Am "edited first line"

				Branch 2: editing line 3:

				$ hg update 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ sed 's/line 3/third line/' f > f.new
				$ mv f.new f
				$ hg ci -Am "edited third line"
				created new head

				Merge using internal:fail tool:

				$ echo "[merge-patterns]" > .hg/hgrc
				$ echo "* = internal:fail" >> .hg/hgrc

				$ hg merge
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]

				$ cat f
				line 1
				line 2
				third line

				$ hg stat
				M f

				Merge using internal:local tool:

				$ hg update -C 2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ sed 's/internal:fail/internal:local/' .hg/hgrc > .hg/hgrc.new
				$ mv .hg/hgrc.new .hg/hgrc

				$ hg merge
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat f
				line 1
				line 2
				third line

				$ hg stat
				M f

				Merge using internal:other tool:

				$ hg update -C 2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ sed 's/internal:local/internal:other/' .hg/hgrc > .hg/hgrc.new
				$ mv .hg/hgrc.new .hg/hgrc

				$ hg merge
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat f
				first line
				line 2
				line 3

				$ hg stat
				M f

				Merge using default tool:

				$ hg update -C 2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm .hg/hgrc

				$ hg merge
				merging f
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat f
				first line
				line 2
				third line

				$ hg stat
				M f