upstream/mercurial-mirror Files · tests/test-merge-internal-tools-pattern.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 "..".

Cédric Krier - - Load All Authors

File last commit:

r50850:2282d8ac default


                r53438:f33f37ac

tip default

Download file

             test-merge-internal-tools-pattern.t
        
                    162 lines
            
             | 3.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-internal-tools-pattern.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Erik Huelsmann
    
filemerge: add 'union' merge to internal merge tool...

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

      internal:union and internal:other) are used when matched by a

      merge-pattern in hgrc

        Adrian Buehlmann
    
tests: unify test-merge-internal-tools-pattern

              r12257
            
      Make sure HGMERGE doesn't interfere with the test:

        $ unset HGMERGE

        Arseniy Alekseyev
    
tests: run many tests in $TESTTMP/repo instead of $TESTTMP...

              r50516
            
        $ hg init repo

        $ cd repo

        Adrian Buehlmann
    
tests: unify test-merge-internal-tools-pattern

              r12257
            
      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

        Pulkit Goyal
    
merge: add `--abort` flag which can abort the merge...

              r35722
            
        use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Adrian Buehlmann
    
tests: unify test-merge-internal-tools-pattern

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

        Erik Huelsmann
    
filemerge: add 'union' merge to internal merge tool...

              r26071
            
      Merge using internal:union tool:

        $ hg update -C 2

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

        $ echo "line 4a" >>f

        $ hg ci -Am "Adding fourth line (commit 4)"

        $ hg update 2

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

        $ echo "line 4b" >>f

        $ hg ci -Am "Adding fourth line v2 (commit 5)"

        created new head

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

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

        $ hg merge 3

        merging f

        Martin von Zweigbergk
    
merge: consider the file merged when using :merge-{local,other}...

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

        Erik Huelsmann
    
filemerge: add 'union' merge to internal merge tool...

              r26071
            
        (branch merge, don't forget to commit)

        $ cat f

        line 1

        line 2

        third line

        line 4b

        line 4a

        Cédric Krier
    
filemerge: add union-other-first as internal merge tool...

              r50850
            
      Merge using internal:union-other-first tool:

        $ hg update -C 4

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

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

        $ echo "* = internal:union-other-first" >> .hg/hgrc

        $ hg merge 3

        merging f

        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

        line 4a

        line 4b

	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

Erik Huelsmann filemerge: add 'union' merge to internal merge tool...	r26071	Make sure that the internal merge tools (internal:fail, internal:local,
		internal:union and internal:other) are used when matched by a
		merge-pattern in hgrc
Adrian Buehlmann tests: unify test-merge-internal-tools-pattern	r12257
		Make sure HGMERGE doesn't interfere with the test:

		$ unset HGMERGE

Arseniy Alekseyev tests: run many tests in $TESTTMP/repo instead of $TESTTMP...	r50516	$ hg init repo
		$ cd repo
Adrian Buehlmann tests: unify test-merge-internal-tools-pattern	r12257
		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
Pulkit Goyal merge: add `--abort` flag which can abort the merge...	r35722	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Adrian Buehlmann tests: unify test-merge-internal-tools-pattern	r12257
		$ 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

Erik Huelsmann filemerge: add 'union' merge to internal merge tool...	r26071	Merge using internal:union tool:

		$ hg update -C 2
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ echo "line 4a" >>f
		$ hg ci -Am "Adding fourth line (commit 4)"
		$ hg update 2
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ echo "line 4b" >>f
		$ hg ci -Am "Adding fourth line v2 (commit 5)"
		created new head

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

		$ hg merge 3
		merging f
Martin von Zweigbergk merge: consider the file merged when using :merge-{local,other}...	r49415	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
Erik Huelsmann filemerge: add 'union' merge to internal merge tool...	r26071	(branch merge, don't forget to commit)

		$ cat f
		line 1
		line 2
		third line
		line 4b
		line 4a
Cédric Krier filemerge: add union-other-first as internal merge tool...	r50850
		Merge using internal:union-other-first tool:

		$ hg update -C 4
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

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

		$ hg merge 3
		merging f
		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
		line 4a
		line 4b