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

lfs: allow non-lfs exchanges when the extension is only enabled on one side...

lfs: allow non-lfs exchanges when the extension is only enabled on one side Once the 'lfs' requirement is added, the extension must be loaded on both sides, and changegroup3 used. But there's no reason that I can see for bailing with cryptic errors if lfs is not required, but randomly enabled somewhere.

Kostia Balytskyi - - Load All Authors

File last commit:

r30460:ce3a133f default


                r35521:2526579a

default

Download file

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

        Adrian Buehlmann
    
combine tests

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

        Siddharth Agarwal
    
simplemerge: move conflict warning message to filemerge...

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

        Adrian Buehlmann
    
combine tests

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

        use 'hg resolve' to retry unresolved file merges

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg diff --nodates

        diff -r dfab7f3c2efb file1

        --- a/file1

        +++ b/file1

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

         added file1

         another line of text

        Kostia Balytskyi
    
conflicts: make spacing consistent in conflict markers...

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

        Adrian Buehlmann
    
combine tests

              r12279
            
        +changed file1 different

        +=======

         changed file1

        Pierre-Yves David
    
merge: drop the quotes around commit description...

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

        Adrian Buehlmann
    
combine tests

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

Adrian Buehlmann combine tests	r12279	$ 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
Siddharth Agarwal simplemerge: move conflict warning message to filemerge...	r26614	warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
Adrian Buehlmann combine tests	r12279	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
		use 'hg resolve' to retry unresolved file merges
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Adrian Buehlmann combine tests	r12279
		$ hg diff --nodates
		diff -r dfab7f3c2efb file1
		--- a/file1
		+++ b/file1
		@@ -1,3 +1,7 @@
		added file1
		another line of text
Kostia Balytskyi conflicts: make spacing consistent in conflict markers...	r30460	+<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2
Adrian Buehlmann combine tests	r12279	+changed file1 different
		+=======
		changed file1
Pierre-Yves David merge: drop the quotes around commit description...	r21693	+>>>>>>> destination: dfab7f3c2efb - test: changed file1
Adrian Buehlmann combine tests	r12279
		$ 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