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

cmdutil: implemented new lazy increasingwindows...

cmdutil: implemented new lazy increasingwindows Now log can work in a lazy way and get results as soon as they are processed. Performance Benchmarking: $ time hg log -l1 -qr "branch(default)" 0:9117c6561b0b real 0m2.303s user 0m2.252s sys 0m0.048s $ time ./hg log -l1 -qr "branch(default)" 0:9117c6561b0b real 0m0.238s user 0m0.199s sys 0m0.037s

Matt Mackall - - Load All Authors

File last commit:

r15501:2371f4ae default


                r20553:86cefb15

default

Download file

             test-merge-revert2.t
        
                    94 lines
            
             | 1.8 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 during merge.

        merging file1 incomplete! (edit conflicts, 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

        +<<<<<<< local

        +changed file1 different

        +=======

         changed file1

        +>>>>>>> other

        $ 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 during merge.
				merging file1 incomplete! (edit conflicts, 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
				+<<<<<<< local
				+changed file1 different
				+=======
				changed file1
				+>>>>>>> other

				$ 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