upstream/mercurial-mirror Files · tests/test-merge-revert2.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.

Kostia Balytskyi - - Load All Authors

File last commit:

r30460:ce3a133f default


                r35825:4425790f

stable

Download file

             test-merge-revert2.t
        
                    93 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-revert2.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo "added file1" > file1

        $ echo "another line of text" >> file1

        $ echo "added file2" > file2

        $ hg add file1 file2

        $ hg commit -m "added file1 and file2"

        $ echo "changed file1" >> file1

        $ hg commit -m "changed file1"

        $ hg -q log

        1:dfab7f3c2efb

        0:c3fa057dd86f

        $ hg id

        dfab7f3c2efb tip

        $ hg update -C 0

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

        $ hg id

        c3fa057dd86f

        $ echo "changed file1" >> file1

        $ hg id

        c3fa057dd86f+

        $ hg revert --no-backup --all

        reverting file1

        $ hg diff

        $ hg status

        $ hg id

        c3fa057dd86f

        $ hg update

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

        $ hg diff

        $ hg status

        $ hg id

        dfab7f3c2efb tip

        $ hg update -C 0

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

        $ echo "changed file1 different" >> file1

        $ hg update

        merging file1

        warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')

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

        use 'hg resolve' to retry unresolved file merges

        [1]

        $ hg diff --nodates

        diff -r dfab7f3c2efb file1

        --- a/file1

        +++ b/file1

        @@ -1,3 +1,7 @@

         added file1

         another line of text

        +<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2

        +changed file1 different

        +=======

         changed file1

        +>>>>>>> destination:  dfab7f3c2efb - test: changed file1

        $ hg status

        M file1

        ? file1.orig

        $ hg id

        dfab7f3c2efb+ tip

        $ hg revert --no-backup --all

        reverting file1

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        dfab7f3c2efb tip

        $ hg revert -r tip --no-backup --all

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        dfab7f3c2efb tip

        $ hg update -C

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

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        dfab7f3c2efb tip

	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

				$ hg init

				$ echo "added file1" > file1
				$ echo "another line of text" >> file1
				$ echo "added file2" > file2
				$ hg add file1 file2
				$ hg commit -m "added file1 and file2"

				$ echo "changed file1" >> file1
				$ hg commit -m "changed file1"

				$ hg -q log
				1:dfab7f3c2efb
				0:c3fa057dd86f
				$ hg id
				dfab7f3c2efb tip

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

				$ echo "changed file1" >> file1
				$ hg id
				c3fa057dd86f+

				$ hg revert --no-backup --all
				reverting file1
				$ hg diff
				$ hg status
				$ hg id
				c3fa057dd86f

				$ hg update
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg diff
				$ hg status
				$ hg id
				dfab7f3c2efb tip

				$ hg update -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo "changed file1 different" >> file1

				$ hg update
				merging file1
				warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges
				[1]

				$ hg diff --nodates
				diff -r dfab7f3c2efb file1
				--- a/file1
				+++ b/file1
				@@ -1,3 +1,7 @@
				added file1
				another line of text
				+<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2
				+changed file1 different
				+=======
				changed file1
				+>>>>>>> destination: dfab7f3c2efb - test: changed file1

				$ hg status
				M file1
				? file1.orig
				$ hg id
				dfab7f3c2efb+ tip

				$ hg revert --no-backup --all
				reverting file1
				$ hg diff
				$ hg status
				? file1.orig
				$ hg id
				dfab7f3c2efb tip

				$ hg revert -r tip --no-backup --all
				$ hg diff
				$ hg status
				? file1.orig
				$ hg id
				dfab7f3c2efb tip

				$ hg update -C
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg diff
				$ hg status
				? file1.orig
				$ hg id
				dfab7f3c2efb tip