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

rhg: add resolve_file_args to path_utils.rs...

rhg: add resolve_file_args to path_utils.rs Extracted logic for resolving `FILE ...` arguments from cat.rs into a new function in path_utils.rs. I plan to use this for rhg annotate. I tried to reuse hg::utils::files::canonical_path instead, but that didn't work. For example it reports a InsideDotHg error for any path containing "..".

Arseniy Alekseyev - - Load All Authors

File last commit:

r50516:55c6ebd1 stable


                r53438:f33f37ac

tip default

Download file

             test-merge-revert.t
        
                    75 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-revert.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Arseniy Alekseyev
    
tests: run many tests in $TESTTMP/repo instead of $TESTTMP...

              r50516
            
        $ hg init repo

        $ cd repo

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ echo "added file1" > 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:08a16e8e4408

        0:d29c767a4b52

        $ hg id

        08a16e8e4408 tip

        $ hg update -C 0

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

        $ hg id

        d29c767a4b52

        $ echo "changed file1" >> file1

        $ hg id

        d29c767a4b52+

        $ hg revert --all

        reverting file1

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        d29c767a4b52

        $ hg update

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

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        08a16e8e4408 tip

        $ hg update -C 0

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

        $ echo "changed file1" >> file1

        $ hg update

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

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        08a16e8e4408 tip

        $ hg revert --all

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        08a16e8e4408 tip

        $ hg revert -r tip --all

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        08a16e8e4408 tip

        $ hg update -C

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

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        08a16e8e4408 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

Arseniy Alekseyev tests: run many tests in $TESTTMP/repo instead of $TESTTMP...	r50516	$ hg init repo
		$ cd repo
Adrian Buehlmann combine tests	r12279
		$ echo "added file1" > 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:08a16e8e4408
		0:d29c767a4b52
		$ hg id
		08a16e8e4408 tip

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

		$ hg revert --all
		reverting file1
		$ hg diff
		$ hg status
		? file1.orig
		$ hg id
		d29c767a4b52

		$ hg update
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg diff
		$ hg status
		? file1.orig
		$ hg id
		08a16e8e4408 tip

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

		$ hg update
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg diff
		$ hg status
		? file1.orig
		$ hg id
		08a16e8e4408 tip

		$ hg revert --all
		$ hg diff
		$ hg status
		? file1.orig
		$ hg id
		08a16e8e4408 tip

		$ hg revert -r tip --all
		$ hg diff
		$ hg status
		? file1.orig
		$ hg id
		08a16e8e4408 tip

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