upstream/mercurial-mirror Files · tests/test-addremove.t

shelve: directly handle the initial parent alignment...

shelve: directly handle the initial parent alignment Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to handle the parent alignment directly. After this change, we no longer need to use rebase in shelve. Differential Revision: https://phab.mercurial-scm.org/D3693

Matt Harbison - - Load All Authors

File last commit:

r35230:feecfefe default


                r38637:c829749e

default

Download file

             test-addremove.t
        
                    94 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-addremove.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init rep

        $ cd rep

        $ mkdir dir

        $ touch foo dir/bar

        $ hg -v addremove

        adding dir/bar

        adding foo

        $ hg -v commit -m "add 1"

        committing files:

        dir/bar

        foo

        committing manifest

        committing changelog

        committed changeset 0:6f7f953567a2

        $ cd dir/

        $ touch ../foo_2 bar_2

        $ hg -v addremove

        adding dir/bar_2

        adding foo_2

        $ hg -v commit -m "add 2"

        committing files:

        dir/bar_2

        foo_2

        committing manifest

        committing changelog

        committed changeset 1:e65414bf35c5

        $ cd ..

        $ hg forget foo

        $ hg -v addremove

        adding foo

        $ hg forget foo

        $ hg -v addremove nonexistent

        nonexistent: $ENOENT$

        [1]

        $ cd ..

        $ hg init subdir

        $ cd subdir

        $ mkdir dir

        $ cd dir

        $ touch a.py

        $ hg addremove 'glob:*.py'

        adding a.py

        $ hg forget a.py

        $ hg addremove -I 'glob:*.py'

        adding a.py

        $ hg forget a.py

        $ hg addremove

        adding dir/a.py

        $ cd ..

        $ hg init sim

        $ cd sim

        $ echo a > a

        $ echo a >> a

        $ echo a >> a

        $ echo c > c

        $ hg commit -Ama

        adding a

        adding c

        $ mv a b

        $ rm c

        $ echo d > d

        $ hg addremove -n -s 50 # issue 1696

        removing a

        adding b

        removing c

        adding d

        recording removal of a as rename to b (100% similar)

        $ hg addremove -s 50

        removing a

        adding b

        removing c

        adding d

        recording removal of a as rename to b (100% similar)

        $ hg commit -mb

        $ cp b c

        $ hg forget b

        $ hg addremove -s 50

        adding b

        adding c

        $ rm c

        $ hg ci -A -m "c" nonexistent

        nonexistent: $ENOENT$

        abort: failed to mark all new/missing files as added/removed

        [255]

        $ hg st

        ! c

        $ cd ..

	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 rep
				$ cd rep
				$ mkdir dir
				$ touch foo dir/bar
				$ hg -v addremove
				adding dir/bar
				adding foo
				$ hg -v commit -m "add 1"
				committing files:
				dir/bar
				foo
				committing manifest
				committing changelog
				committed changeset 0:6f7f953567a2
				$ cd dir/
				$ touch ../foo_2 bar_2
				$ hg -v addremove
				adding dir/bar_2
				adding foo_2
				$ hg -v commit -m "add 2"
				committing files:
				dir/bar_2
				foo_2
				committing manifest
				committing changelog
				committed changeset 1:e65414bf35c5
				$ cd ..
				$ hg forget foo
				$ hg -v addremove
				adding foo
				$ hg forget foo

				$ hg -v addremove nonexistent
				nonexistent: $ENOENT$
				[1]

				$ cd ..

				$ hg init subdir
				$ cd subdir
				$ mkdir dir
				$ cd dir
				$ touch a.py
				$ hg addremove 'glob:*.py'
				adding a.py
				$ hg forget a.py
				$ hg addremove -I 'glob:*.py'
				adding a.py
				$ hg forget a.py
				$ hg addremove
				adding dir/a.py
				$ cd ..

				$ hg init sim
				$ cd sim
				$ echo a > a
				$ echo a >> a
				$ echo a >> a
				$ echo c > c
				$ hg commit -Ama
				adding a
				adding c
				$ mv a b
				$ rm c
				$ echo d > d
				$ hg addremove -n -s 50 # issue 1696
				removing a
				adding b
				removing c
				adding d
				recording removal of a as rename to b (100% similar)
				$ hg addremove -s 50
				removing a
				adding b
				removing c
				adding d
				recording removal of a as rename to b (100% similar)
				$ hg commit -mb
				$ cp b c
				$ hg forget b
				$ hg addremove -s 50
				adding b
				adding c

				$ rm c

				$ hg ci -A -m "c" nonexistent
				nonexistent: $ENOENT$
				abort: failed to mark all new/missing files as added/removed
				[255]

				$ hg st
				! c
				$ cd ..