upstream/mercurial-mirror Files · tests/test-issue522.t

lfs: don't require the .hglfs file to be tracked to control the policy...

lfs: don't require the .hglfs file to be tracked to control the policy The .hgignore file doesn't need to be tracked, nor does the git equivalent of this file. I'm still a little concerned about the effects of forgetting to commit this file. But the fact that conversions maintain the hashes if only the normal vs external storage changes, should make this less risky.

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r35825:4425790f

stable

Download file

             test-issue522.t
        
                    55 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue522.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      https://bz.mercurial-scm.org/522

      In the merge below, the file "foo" has the same contents in both

      parents, but if we look at the file-level history, we'll notice that

      the version in p1 is an ancestor of the version in p2. This test makes

      sure that we'll use the version from p2 in the manifest of the merge

      revision.

        $ hg init

        $ echo foo > foo

        $ hg ci -qAm 'add foo'

        $ echo bar >> foo

        $ hg ci -m 'change foo'

        $ hg backout -r tip -m 'backout changed foo'

        reverting foo

        changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e

        $ hg up -C 0

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

        $ touch bar

        $ hg ci -qAm 'add bar'

        $ hg merge --debug

          searching for copies back to rev 1

          unmatched files in local:

           bar

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee

         foo: remote is newer -> g

        getting foo

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

        (branch merge, don't forget to commit)

        $ hg debugstate | grep foo

        m   0         -2 unset               foo

        $ hg st -A foo

        M foo

        $ hg ci -m 'merge'

        $ hg manifest --debug | grep foo

        c6fc755d7e68f49f880599da29f15add41f42f5a 644   foo

        $ hg debugindex foo

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

             0         0       5  .....       0 2ed2a3912a0b 000000000000 000000000000 (re)

             1         5       9  .....       1 6f4310b00b9a 2ed2a3912a0b 000000000000 (re)

             2        14       5  .....       2 c6fc755d7e68 6f4310b00b9a 000000000000 (re)

	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

				https://bz.mercurial-scm.org/522

				In the merge below, the file "foo" has the same contents in both
				parents, but if we look at the file-level history, we'll notice that
				the version in p1 is an ancestor of the version in p2. This test makes
				sure that we'll use the version from p2 in the manifest of the merge
				revision.

				$ hg init

				$ echo foo > foo
				$ hg ci -qAm 'add foo'

				$ echo bar >> foo
				$ hg ci -m 'change foo'

				$ hg backout -r tip -m 'backout changed foo'
				reverting foo
				changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e

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

				$ touch bar
				$ hg ci -qAm 'add bar'

				$ hg merge --debug
				searching for copies back to rev 1
				unmatched files in local:
				bar
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee
				foo: remote is newer -> g
				getting foo
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg debugstate \| grep foo
				m 0 -2 unset foo

				$ hg st -A foo
				M foo

				$ hg ci -m 'merge'

				$ hg manifest --debug \| grep foo
				c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo

				$ hg debugindex foo
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 5 ..... 0 2ed2a3912a0b 000000000000 000000000000 (re)
				1 5 9 ..... 1 6f4310b00b9a 2ed2a3912a0b 000000000000 (re)
				2 14 5 ..... 2 c6fc755d7e68 6f4310b00b9a 000000000000 (re)