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

dockerlib: allow non-unique uid and gid of $DBUILDUSER (issue4657)...

dockerlib: allow non-unique uid and gid of $DBUILDUSER (issue4657) There are make targets for building mercurial packages for various distributions using docker. One of the preparation steps before building is to create inside the docker image a user with the same uid/gid as the current user on the host system, so that the resulting files have appropriate ownership/permissions. It's possible to run `make docker-<distro>` as a user with uid or gid that is already present in a vanilla docker container of that distibution. For example, issue4657 is about failing to build fedora packages as a user with uid=999 and gid=999 because these ids are already used in fedora, and groupadd fails. useradd would fail too, if the flow ever got to it (and there was a user with such uid already). A straightforward (maybe too much) way to fix this is to allow non-unique uid and gid for the new user and group that get created inside the image. I'm not sure of the implications of this, but marmoute encouraged me to try and send this patch for stable.

Siddharth Agarwal - - Load All Authors

File last commit:

r26618:8e6d5b73 default


                r26888:271a8020

stable

Download file

             test-merge-commit.t
        
                    182 lines
            
             | 5.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-commit.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Check that renames are correctly saved by a commit after a merge

      Test with the merge on 3 having the rename on the local parent

        $ hg init a

        $ cd a

        $ echo line1 > foo

        $ hg add foo

        $ hg ci -m '0: add foo'

        $ echo line2 >> foo

        $ hg ci -m '1: change foo'

        $ hg up -C 0

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

        $ hg mv foo bar

        $ rm bar

        $ echo line0 > bar

        $ echo line1 >> bar

        $ hg ci -m '2: mv foo bar; change bar'

        created new head

        $ hg merge 1

        merging bar and foo to bar

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

        (branch merge, don't forget to commit)

        $ cat bar

        line0

        line1

        line2

        $ hg ci -m '3: merge with local rename'

        $ hg debugindex bar

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0      77  .....       2 d35118874825 000000000000 000000000000 (re)

             1        77      76  .....       3 5345f5ab8abd 000000000000 d35118874825 (re)

        $ hg debugrename bar

        bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2

        $ hg debugindex foo

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0       7  .....       0 690b295714ae 000000000000 000000000000 (re)

             1         7      13  .....       1 9e25c27b8757 690b295714ae 000000000000 (re)

      Revert the content change from rev 2:

        $ hg up -C 2

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

        $ rm bar

        $ echo line1 > bar

        $ hg ci -m '4: revert content change from rev 2'

        created new head

        $ hg log --template '{rev}:{node|short} {parents}\n'

        4:2263c1be0967 2:0f2ff26688b9 

        3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d 

        2:0f2ff26688b9 0:2665aaee66e9 

        1:5cd961e4045d 

        0:2665aaee66e9 

      This should use bar@rev2 as the ancestor:

        $ hg --debug merge 3

          searching for copies back to rev 1

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28

         preserving bar for resolve of bar

         bar: versions differ -> m (premerge)

        picked tool ':merge' for bar (binary False symlink False)

        merging bar

        my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9

         premerge successful

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

        (branch merge, don't forget to commit)

        $ cat bar

        line1

        line2

        $ hg ci -m '5: merge'

        $ hg debugindex bar

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0      77  .....       2 d35118874825 000000000000 000000000000 (re)

             1        77      76  .....       3 5345f5ab8abd 000000000000 d35118874825 (re)

             2       153       7  .....       4 ff4b45017382 d35118874825 000000000000 (re)

             3       160      13  .....       5 3701b4893544 ff4b45017382 5345f5ab8abd (re)

      Same thing, but with the merge on 3 having the rename

      on the remote parent:

        $ cd ..

        $ hg clone -U -r 1 -r 2 a b

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 2 files (+1 heads)

        $ cd b

        $ hg up -C 1

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

        $ hg merge 2

        merging foo and bar to bar

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

        (branch merge, don't forget to commit)

        $ cat bar

        line0

        line1

        line2

        $ hg ci -m '3: merge with remote rename'

        $ hg debugindex bar

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0      77  .....       2 d35118874825 000000000000 000000000000 (re)

             1        77      76  .....       3 5345f5ab8abd 000000000000 d35118874825 (re)

        $ hg debugrename bar

        bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2

        $ hg debugindex foo

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0       7  .....       0 690b295714ae 000000000000 000000000000 (re)

             1         7      13  .....       1 9e25c27b8757 690b295714ae 000000000000 (re)

      Revert the content change from rev 2:

        $ hg up -C 2

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

        $ rm bar

        $ echo line1 > bar

        $ hg ci -m '4: revert content change from rev 2'

        created new head

        $ hg log --template '{rev}:{node|short} {parents}\n'

        4:2263c1be0967 2:0f2ff26688b9 

        3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9 

        2:0f2ff26688b9 0:2665aaee66e9 

        1:5cd961e4045d 

        0:2665aaee66e9 

      This should use bar@rev2 as the ancestor:

        $ hg --debug merge 3

          searching for copies back to rev 1

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0

         preserving bar for resolve of bar

         bar: versions differ -> m (premerge)

        picked tool ':merge' for bar (binary False symlink False)

        merging bar

        my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9

         premerge successful

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

        (branch merge, don't forget to commit)

        $ cat bar

        line1

        line2

        $ hg ci -m '5: merge'

        $ hg debugindex bar

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0      77  .....       2 d35118874825 000000000000 000000000000 (re)

             1        77      76  .....       3 5345f5ab8abd 000000000000 d35118874825 (re)

             2       153       7  .....       4 ff4b45017382 d35118874825 000000000000 (re)

             3       160      13  .....       5 3701b4893544 ff4b45017382 5345f5ab8abd (re)

        $ 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

				Check that renames are correctly saved by a commit after a merge

				Test with the merge on 3 having the rename on the local parent

				$ hg init a
				$ cd a

				$ echo line1 > foo
				$ hg add foo
				$ hg ci -m '0: add foo'

				$ echo line2 >> foo
				$ hg ci -m '1: change foo'

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

				$ hg mv foo bar
				$ rm bar
				$ echo line0 > bar
				$ echo line1 >> bar
				$ hg ci -m '2: mv foo bar; change bar'
				created new head

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

				$ cat bar
				line0
				line1
				line2

				$ hg ci -m '3: merge with local rename'

				$ hg debugindex bar
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re)
				1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re)

				$ hg debugrename bar
				bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2

				$ hg debugindex foo
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re)
				1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re)


				Revert the content change from rev 2:

				$ hg up -C 2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm bar
				$ echo line1 > bar
				$ hg ci -m '4: revert content change from rev 2'
				created new head

				$ hg log --template '{rev}:{node\|short} {parents}\n'
				4:2263c1be0967 2:0f2ff26688b9
				3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d
				2:0f2ff26688b9 0:2665aaee66e9
				1:5cd961e4045d
				0:2665aaee66e9

				This should use bar@rev2 as the ancestor:

				$ hg --debug merge 3
				searching for copies back to rev 1
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
				preserving bar for resolve of bar
				bar: versions differ -> m (premerge)
				picked tool ':merge' for bar (binary False symlink False)
				merging bar
				my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
				premerge successful
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat bar
				line1
				line2

				$ hg ci -m '5: merge'

				$ hg debugindex bar
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re)
				1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re)
				2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re)
				3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re)


				Same thing, but with the merge on 3 having the rename
				on the remote parent:

				$ cd ..
				$ hg clone -U -r 1 -r 2 a b
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 3 changes to 2 files (+1 heads)
				$ cd b

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

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

				$ cat bar
				line0
				line1
				line2

				$ hg ci -m '3: merge with remote rename'

				$ hg debugindex bar
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re)
				1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re)

				$ hg debugrename bar
				bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2

				$ hg debugindex foo
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re)
				1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re)


				Revert the content change from rev 2:

				$ hg up -C 2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm bar
				$ echo line1 > bar
				$ hg ci -m '4: revert content change from rev 2'
				created new head

				$ hg log --template '{rev}:{node\|short} {parents}\n'
				4:2263c1be0967 2:0f2ff26688b9
				3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9
				2:0f2ff26688b9 0:2665aaee66e9
				1:5cd961e4045d
				0:2665aaee66e9

				This should use bar@rev2 as the ancestor:

				$ hg --debug merge 3
				searching for copies back to rev 1
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
				preserving bar for resolve of bar
				bar: versions differ -> m (premerge)
				picked tool ':merge' for bar (binary False symlink False)
				merging bar
				my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
				premerge successful
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat bar
				line1
				line2

				$ hg ci -m '5: merge'

				$ hg debugindex bar
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re)
				1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re)
				2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re)
				3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re)

				$ cd ..