upstream/mercurial-mirror Files · tests/test-confused-revert.t

context: possibly yield initial fctx in blockdescendants()...

context: possibly yield initial fctx in blockdescendants() If initial 'fctx' has changes in line range with respect to its parents, we yield it first. This makes 'followlines(..., descend=True)' consistent with 'descendants()' revset which yields the starting revision. We reuse one iteration of blockancestors() which does exactly what we want. In test-annotate.t, adjust 'startrev' in one case to cover the situation where the starting revision does not touch specified line range.

timeless - - Load All Authors

File last commit:

r28963:fc1d75e7 default


                r31992:3e47a40d

default

Download file

             test-confused-revert.t
        
                    82 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-confused-revert.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo foo > a

        $ hg add a

        $ hg commit -m "1"

        $ echo bar > b

        $ hg add b

        $ hg remove a

      Should show a removed and b added:

        $ hg status

        A b

        R a

        $ hg revert --all

        undeleting a

        forgetting b

      Should show b unknown and a back to normal:

        $ hg status

        ? b

        $ rm b

        $ hg co -C 0

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

        $ echo foo-a > a

        $ hg commit -m "2a"

        $ hg co -C 0

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

        $ echo foo-b > a

        $ hg commit -m "2b"

        created new head

        $ HGMERGE=true hg merge 1

        merging a

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

        (branch merge, don't forget to commit)

      Should show foo-b:

        $ cat a

        foo-b

        $ echo bar > b

        $ hg add b

        $ rm a

        $ hg remove a

      Should show a removed and b added:

        $ hg status

        A b

        R a

      Revert should fail:

        $ hg revert

        abort: uncommitted merge with no revision specified

        (use 'hg update' or see 'hg help revert')

        [255]

      Revert should be ok now:

        $ hg revert -r2 --all

        undeleting a

        forgetting b

      Should show b unknown and a marked modified (merged):

        $ hg status

        M a

        ? b

      Should show foo-b:

        $ cat a

        foo-b

	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 foo > a
				$ hg add a
				$ hg commit -m "1"

				$ echo bar > b
				$ hg add b
				$ hg remove a

				Should show a removed and b added:

				$ hg status
				A b
				R a

				$ hg revert --all
				undeleting a
				forgetting b

				Should show b unknown and a back to normal:

				$ hg status
				? b

				$ rm b

				$ hg co -C 0
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo foo-a > a
				$ hg commit -m "2a"

				$ hg co -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo foo-b > a
				$ hg commit -m "2b"
				created new head

				$ HGMERGE=true hg merge 1
				merging a
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				Should show foo-b:

				$ cat a
				foo-b

				$ echo bar > b
				$ hg add b
				$ rm a
				$ hg remove a

				Should show a removed and b added:

				$ hg status
				A b
				R a

				Revert should fail:

				$ hg revert
				abort: uncommitted merge with no revision specified
				(use 'hg update' or see 'hg help revert')
				[255]

				Revert should be ok now:

				$ hg revert -r2 --all
				undeleting a
				forgetting b

				Should show b unknown and a marked modified (merged):

				$ hg status
				M a
				? b

				Should show foo-b:

				$ cat a
				foo-b