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

errors: name arguments to UnknownCommand constructor...

errors: name arguments to UnknownCommand constructor Differential Revision: https://phab.mercurial-scm.org/D9166

marmoute - - Load All Authors

File last commit:

r45401:6d968cd4 stable


                r46272:bb1a988e

default

Download file

             test-merge-exec.t
        
                    434 lines
            
             | 8.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-exec.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marmoute
    
flags: introduce explicit testing for merging change to exec flag...

              r45394
            
      ===============================================

      Testing merge involving change to the exec flag

      ===============================================

      #require execbit

      Initial setup

      ==============

        $ hg init base-repo

        $ cd base-repo

        $ cat << EOF > a

        > 1

        > 2

        > 3

        > 4

        > 5

        > 6

        > 7

        > 8

        > 9

        > EOF

        $ touch b

        $ hg add a b

        $ hg commit -m "initial commit"

        $ cd ..

        marmoute
    
flags: also test the removal of the exec flag...

              r45400
            
        $ hg init base-exec

        $ cd base-exec

        $ cat << EOF > a

        > 1

        > 2

        > 3

        > 4

        > 5

        > 6

        > 7

        > 8

        > 9

        > EOF

        $ chmod +x a

        $ touch b

        $ hg add a b

        $ hg commit -m "initial commit"

        $ cd ..

        marmoute
    
flags: introduce explicit testing for merging change to exec flag...

              r45394
            
      Testing merging mode change

      ===========================

        marmoute
    
flags: also test the removal of the exec flag...

              r45400
            
      Adding the flag

      ---------------

        marmoute
    
flags: introduce explicit testing for merging change to exec flag...

              r45394
            
      setup

      Change on one side, executable bit on the other

        $ hg clone base-repo simple-merge-repo

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd simple-merge-repo

        $ chmod +x a

        $ hg ci -m "make a executable, no change"

        $ [ -x a ] || echo "executable bit not recorded"

        $ hg up ".^"

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

        $ cat << EOF > a

        > 1

        > 2

        > 3

        > 4

        > 5

        > 6

        > 7

        > x

        > 9

        > EOF

        $ hg commit -m "edit end of file"

        created new head

      merge them (from the update side)

        $ hg merge 'desc("make a executable, no change")'

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

        (branch merge, don't forget to commit)

        $ hg st

        M a

        $ [ -x a ] || echo "executable bit lost"

      merge them (from the chmod side)

        $ hg up -C 'desc("make a executable, no change")'

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

        $ hg merge 'desc("edit end of file")'

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

        (branch merge, don't forget to commit)

        $ hg st

        M a

        $ [ -x a ] || echo "executable bit lost"

        $ cd ..

        marmoute
    
flags: also test the removal of the exec flag...

              r45400
            
      Removing the flag

      -----------------

      Change on one side, executable bit on the other

        $ hg clone base-exec simple-merge-repo-removal

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd simple-merge-repo-removal

        $ chmod -x a

        $ hg ci -m "make a non-executable, no change"

        $ [ -x a ] && echo "executable bit not removed"

        [1]

        $ hg up ".^"

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

        $ cat << EOF > a

        > 1

        > 2

        > 3

        > 4

        > 5

        > 6

        > 7

        > x

        > 9

        > EOF

        $ hg commit -m "edit end of file"

        created new head

      merge them (from the update side)

        $ hg merge 'desc("make a non-executable, no change")'

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

        (branch merge, don't forget to commit)

        $ hg st

        M a

        $ [ -x a ] && echo "executable bit not removed"

        [1]

      merge them (from the chmod side)

        $ hg up -C 'desc("make a non-executable, no change")'

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

        $ hg merge 'desc("edit end of file")'

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

        (branch merge, don't forget to commit)

        $ hg st

        M a

        $ [ -x a ] && echo "executable bit not removed"

        [1]

        $ cd ..

        marmoute
    
flags: also test merging a rename with and exec flag change...

              r45395
            
      Testing merging mode change with rename

      =======================================

        marmoute
    
flags: also test merge with executable bit removed...

              r45401
            
      Adding the flag

      ---------------

        marmoute
    
flags: also test merging a rename with and exec flag change...

              r45395
            
        $ hg clone base-repo rename-merge-repo

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd rename-merge-repo

      make "a" executable on one side

        $ chmod +x a

        $ hg status

        M a

        $ hg ci -m "make a executable"

        $ [ -x a ] || echo "executable bit not recorded"

        $ hg up ".^"

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

      make "a" renamed on the other side

        $ hg mv a z

        $ hg st --copies

        A z

          a

        R a

        $ hg ci -m "rename a to z"

        created new head

      merge them (from the rename side)

        $ hg merge 'desc("make a executable")'

        marmoute
    
flags: account for flag change when tracking rename relevant to merge...

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

        marmoute
    
flags: also test merging a rename with and exec flag change...

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

        $ hg st --copies

        marmoute
    
flags: account for flag change when tracking rename relevant to merge...

              r45396
            
        M z

          a

        marmoute
    
flags: also test merging a rename with and exec flag change...

              r45395
            
        $ [ -x z ] || echo "executable bit lost"

      merge them (from the chmod side)

        $ hg up -C 'desc("make a executable")'

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

        $ hg merge 'desc("rename a to z")'

        marmoute
    
flags: account for flag change when tracking rename relevant to merge...

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

        marmoute
    
flags: also test merging a rename with and exec flag change...

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

        $ hg st --copies

        M z

        marmoute
    
flags: account for flag change when tracking rename relevant to merge...

              r45396
            
          a

        marmoute
    
flags: also test merging a rename with and exec flag change...

              r45395
            
        R a

        $ [ -x z ] || echo "executable bit lost"

        $ cd ..

        marmoute
    
flags: add a test for merging exec flag change with rename and file change...

              r45397
            
        marmoute
    
flags: also test merge with executable bit removed...

              r45401
            
      Removing the flag

      -----------------

        $ hg clone base-exec rename-merge-repo-removal

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd rename-merge-repo-removal

      make "a" non-executable on one side

        $ chmod -x a

        $ hg status

        M a

        $ hg ci -m "make a non-executable"

        $ [ -x a ] && echo "executable bit not removed"

        [1]

        $ hg up ".^"

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

      make "a" renamed on the other side

        $ hg mv a z

        $ hg st --copies

        A z

          a

        R a

        $ hg ci -m "rename a to z"

        created new head

      merge them (from the rename side)

        $ hg merge 'desc("make a non-executable")'

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

        (branch merge, don't forget to commit)

        $ hg st --copies

        M z

          a

        $ [ -x z ] && echo "executable bit not removed"

        [1]

      merge them (from the chmod side)

        $ hg up -C 'desc("make a non-executable")'

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

        $ hg merge 'desc("rename a to z")'

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

        (branch merge, don't forget to commit)

        $ hg st --copies

        M z

          a

        R a

        $ [ -x z ] && echo "executable bit not removed"

        [1]

        $ cd ..

        marmoute
    
flags: add a test for merging exec flag change with rename and file change...

              r45397
            
      Testing merging mode change with rename + modification on both side

      ===================================================================

        marmoute
    
flags: also test merge with executable bit removed...

              r45401
            
      Adding the flag

      ---------------

        marmoute
    
flags: add a test for merging exec flag change with rename and file change...

              r45397
            
        $ hg clone base-repo rename+mod-merge-repo

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd rename+mod-merge-repo

      make "a" executable on one side

        $ chmod +x a

        $ cat << EOF > a

        > 1

        > x

        > 3

        > 4

        > 5

        > 6

        > 7

        > 8

        > 9

        > EOF

        $ hg status

        M a

        $ hg ci -m "make a executable, and change start"

        $ [ -x a ] || echo "executable bit not recorded"

        $ hg up ".^"

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

      make "a" renamed on the other side

        $ hg mv a z

        $ hg st --copies

        A z

          a

        R a

        $ cat << EOF > z

        > 1

        > 2

        > 3

        > 4

        > 5

        > 6

        > 7

        > x

        > 9

        > EOF

        $ hg ci -m "rename a to z, and change end"

        created new head

      merge them (from the rename side)

        $ hg merge 'desc("make a executable")'

        merging z and a to z

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

        (branch merge, don't forget to commit)

        $ hg st --copies

        M z

          a

        $ [ -x z ] || echo "executable bit lost"

      merge them (from the chmod side)

        $ hg up -C 'desc("make a executable")'

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

        $ hg merge 'desc("rename a to z")'

        merging a and z to z

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

        (branch merge, don't forget to commit)

        $ hg st --copies

        M z

          a

        R a

        $ [ -x z ] || echo "executable bit lost"

        $ cd ..

        marmoute
    
flags: also test merge with executable bit removed...

              r45401
            
      Removing the flag

      -----------------

        $ hg clone base-exec rename+mod-merge-repo-removal

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd rename+mod-merge-repo-removal

      make "a" non-executable on one side

        $ chmod -x a

        $ cat << EOF > a

        > 1

        > x

        > 3

        > 4

        > 5

        > 6

        > 7

        > 8

        > 9

        > EOF

        $ hg status

        M a

        $ hg ci -m "make a non-executable, and change start"

        $ [ -x z ] && echo "executable bit not removed"

        [1]

        $ hg up ".^"

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

      make "a" renamed on the other side

        $ hg mv a z

        $ hg st --copies

        A z

          a

        R a

        $ cat << EOF > z

        > 1

        > 2

        > 3

        > 4

        > 5

        > 6

        > 7

        > x

        > 9

        > EOF

        $ hg ci -m "rename a to z, and change end"

        created new head

      merge them (from the rename side)

        $ hg merge 'desc("make a non-executable")'

        merging z and a to z

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

        (branch merge, don't forget to commit)

        $ hg st --copies

        M z

          a

        $ [ -x z ] && echo "executable bit not removed"

        [1]

      merge them (from the chmod side)

        $ hg up -C 'desc("make a non-executable")'

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

        $ hg merge 'desc("rename a to z")'

        merging a and z to z

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

        (branch merge, don't forget to commit)

        $ hg st --copies

        M z

          a

        R a

        $ [ -x z ] && echo "executable bit not removed"

        [1]

        $ cd ..

	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

marmoute flags: introduce explicit testing for merging change to exec flag...	r45394	===============================================
		Testing merge involving change to the exec flag
		===============================================

		#require execbit


		Initial setup
		==============


		$ hg init base-repo
		$ cd base-repo
		$ cat << EOF > a
		> 1
		> 2
		> 3
		> 4
		> 5
		> 6
		> 7
		> 8
		> 9
		> EOF
		$ touch b
		$ hg add a b
		$ hg commit -m "initial commit"
		$ cd ..

marmoute flags: also test the removal of the exec flag...	r45400	$ hg init base-exec
		$ cd base-exec
		$ cat << EOF > a
		> 1
		> 2
		> 3
		> 4
		> 5
		> 6
		> 7
		> 8
		> 9
		> EOF
		$ chmod +x a
		$ touch b
		$ hg add a b
		$ hg commit -m "initial commit"
		$ cd ..

marmoute flags: introduce explicit testing for merging change to exec flag...	r45394	Testing merging mode change
		===========================

marmoute flags: also test the removal of the exec flag...	r45400	Adding the flag
		---------------

marmoute flags: introduce explicit testing for merging change to exec flag...	r45394	setup

		Change on one side, executable bit on the other

		$ hg clone base-repo simple-merge-repo
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd simple-merge-repo
		$ chmod +x a
		$ hg ci -m "make a executable, no change"
		$ [ -x a ] \|\| echo "executable bit not recorded"
		$ hg up ".^"
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cat << EOF > a
		> 1
		> 2
		> 3
		> 4
		> 5
		> 6
		> 7
		> x
		> 9
		> EOF
		$ hg commit -m "edit end of file"
		created new head

		merge them (from the update side)

		$ hg merge 'desc("make a executable, no change")'
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg st
		M a
		$ [ -x a ] \|\| echo "executable bit lost"

		merge them (from the chmod side)

		$ hg up -C 'desc("make a executable, no change")'
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg merge 'desc("edit end of file")'
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg st
		M a
		$ [ -x a ] \|\| echo "executable bit lost"


		$ cd ..

marmoute flags: also test the removal of the exec flag...	r45400
		Removing the flag
		-----------------

		Change on one side, executable bit on the other

		$ hg clone base-exec simple-merge-repo-removal
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd simple-merge-repo-removal
		$ chmod -x a
		$ hg ci -m "make a non-executable, no change"
		$ [ -x a ] && echo "executable bit not removed"
		[1]
		$ hg up ".^"
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cat << EOF > a
		> 1
		> 2
		> 3
		> 4
		> 5
		> 6
		> 7
		> x
		> 9
		> EOF
		$ hg commit -m "edit end of file"
		created new head

		merge them (from the update side)

		$ hg merge 'desc("make a non-executable, no change")'
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg st
		M a
		$ [ -x a ] && echo "executable bit not removed"
		[1]

		merge them (from the chmod side)

		$ hg up -C 'desc("make a non-executable, no change")'
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg merge 'desc("edit end of file")'
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg st
		M a
		$ [ -x a ] && echo "executable bit not removed"
		[1]


		$ cd ..

marmoute flags: also test merging a rename with and exec flag change...	r45395	Testing merging mode change with rename
		=======================================

marmoute flags: also test merge with executable bit removed...	r45401	Adding the flag
		---------------

marmoute flags: also test merging a rename with and exec flag change...	r45395	$ hg clone base-repo rename-merge-repo
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd rename-merge-repo

		make "a" executable on one side

		$ chmod +x a
		$ hg status
		M a
		$ hg ci -m "make a executable"
		$ [ -x a ] \|\| echo "executable bit not recorded"
		$ hg up ".^"
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		make "a" renamed on the other side

		$ hg mv a z
		$ hg st --copies
		A z
		a
		R a
		$ hg ci -m "rename a to z"
		created new head

		merge them (from the rename side)

		$ hg merge 'desc("make a executable")'
marmoute flags: account for flag change when tracking rename relevant to merge...	r45396	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
marmoute flags: also test merging a rename with and exec flag change...	r45395	(branch merge, don't forget to commit)
		$ hg st --copies
marmoute flags: account for flag change when tracking rename relevant to merge...	r45396	M z
		a
marmoute flags: also test merging a rename with and exec flag change...	r45395	$ [ -x z ] \|\| echo "executable bit lost"

		merge them (from the chmod side)

		$ hg up -C 'desc("make a executable")'
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ hg merge 'desc("rename a to z")'
marmoute flags: account for flag change when tracking rename relevant to merge...	r45396	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
marmoute flags: also test merging a rename with and exec flag change...	r45395	(branch merge, don't forget to commit)
		$ hg st --copies
		M z
marmoute flags: account for flag change when tracking rename relevant to merge...	r45396	a
marmoute flags: also test merging a rename with and exec flag change...	r45395	R a
		$ [ -x z ] \|\| echo "executable bit lost"


		$ cd ..
marmoute flags: add a test for merging exec flag change with rename and file change...	r45397
marmoute flags: also test merge with executable bit removed...	r45401	Removing the flag
		-----------------

		$ hg clone base-exec rename-merge-repo-removal
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd rename-merge-repo-removal

		make "a" non-executable on one side

		$ chmod -x a
		$ hg status
		M a
		$ hg ci -m "make a non-executable"
		$ [ -x a ] && echo "executable bit not removed"
		[1]
		$ hg up ".^"
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		make "a" renamed on the other side

		$ hg mv a z
		$ hg st --copies
		A z
		a
		R a
		$ hg ci -m "rename a to z"
		created new head

		merge them (from the rename side)

		$ hg merge 'desc("make a non-executable")'
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg st --copies
		M z
		a
		$ [ -x z ] && echo "executable bit not removed"
		[1]

		merge them (from the chmod side)

		$ hg up -C 'desc("make a non-executable")'
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ hg merge 'desc("rename a to z")'
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg st --copies
		M z
		a
		R a
		$ [ -x z ] && echo "executable bit not removed"
		[1]


		$ cd ..


marmoute flags: add a test for merging exec flag change with rename and file change...	r45397	Testing merging mode change with rename + modification on both side
		===================================================================


marmoute flags: also test merge with executable bit removed...	r45401	Adding the flag
		---------------

marmoute flags: add a test for merging exec flag change with rename and file change...	r45397	$ hg clone base-repo rename+mod-merge-repo
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd rename+mod-merge-repo

		make "a" executable on one side

		$ chmod +x a
		$ cat << EOF > a
		> 1
		> x
		> 3
		> 4
		> 5
		> 6
		> 7
		> 8
		> 9
		> EOF
		$ hg status
		M a
		$ hg ci -m "make a executable, and change start"
		$ [ -x a ] \|\| echo "executable bit not recorded"
		$ hg up ".^"
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		make "a" renamed on the other side

		$ hg mv a z
		$ hg st --copies
		A z
		a
		R a
		$ cat << EOF > z
		> 1
		> 2
		> 3
		> 4
		> 5
		> 6
		> 7
		> x
		> 9
		> EOF
		$ hg ci -m "rename a to z, and change end"
		created new head

		merge them (from the rename side)

		$ hg merge 'desc("make a executable")'
		merging z and a to z
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg st --copies
		M z
		a
		$ [ -x z ] \|\| echo "executable bit lost"

		merge them (from the chmod side)

		$ hg up -C 'desc("make a executable")'
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ hg merge 'desc("rename a to z")'
		merging a and z to z
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg st --copies
		M z
		a
		R a
		$ [ -x z ] \|\| echo "executable bit lost"

		$ cd ..
marmoute flags: also test merge with executable bit removed...	r45401
		Removing the flag
		-----------------

		$ hg clone base-exec rename+mod-merge-repo-removal
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd rename+mod-merge-repo-removal

		make "a" non-executable on one side

		$ chmod -x a
		$ cat << EOF > a
		> 1
		> x
		> 3
		> 4
		> 5
		> 6
		> 7
		> 8
		> 9
		> EOF
		$ hg status
		M a
		$ hg ci -m "make a non-executable, and change start"
		$ [ -x z ] && echo "executable bit not removed"
		[1]
		$ hg up ".^"
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		make "a" renamed on the other side

		$ hg mv a z
		$ hg st --copies
		A z
		a
		R a
		$ cat << EOF > z
		> 1
		> 2
		> 3
		> 4
		> 5
		> 6
		> 7
		> x
		> 9
		> EOF
		$ hg ci -m "rename a to z, and change end"
		created new head

		merge them (from the rename side)

		$ hg merge 'desc("make a non-executable")'
		merging z and a to z
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg st --copies
		M z
		a
		$ [ -x z ] && echo "executable bit not removed"
		[1]

		merge them (from the chmod side)

		$ hg up -C 'desc("make a non-executable")'
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ hg merge 'desc("rename a to z")'
		merging a and z to z
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg st --copies
		M z
		a
		R a
		$ [ -x z ] && echo "executable bit not removed"
		[1]

		$ cd ..