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

subrepos: abort commit by default if a subrepo is dirty (BC)...

subrepos: abort commit by default if a subrepo is dirty (BC) This changeset flips the default value of ui.commitsubrepos setting from True to False and adds a --subrepos flag to commit. The commit, status, and diff commands behave like this with regard to recusion and the ui.commitsubrepos setting: | recurses | recurses | by default | with --subrepos --------+---------------+---------------- commit: | commitsubrepo | True status: | False | True diff: | False | True By changing the default from True to False, the table becomes consistent in the two columns: * without --subrepos on the command line, commit will abort if a subrepo is dirty and status/diff wont show changes inside subrepos. * with --subrepos, all three commands will recurse. A --subrepos flag on the command line overrides the config settin.g

Nicolas Dumazet - - Load All Authors

File last commit:

r14112:3956ea94 default


                r15321:e174353e

stable

Download file

             test-issue660.t
        
                    145 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue660.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      http://mercurial.selenic.com/bts/issue660 and:

      http://mercurial.selenic.com/bts/issue322

        $ hg init

        $ echo a > a

        $ mkdir b

        $ echo b > b/b

        $ hg commit -A -m "a is file, b is dir"

        adding a

        adding b/b

      File replaced with directory:

        $ rm a

        $ mkdir a

        $ echo a > a/a

      Should fail - would corrupt dirstate:

        $ hg add a/a

        abort: file 'a' in dirstate clashes with 'a/a'

        [255]

      Removing shadow:

        $ hg rm --after a

      Should succeed - shadow removed:

        $ hg add a/a

      Directory replaced with file:

        $ rm -r b

        $ echo b > b

      Should fail - would corrupt dirstate:

        $ hg add b

        abort: directory 'b' already in dirstate

        [255]

      Removing shadow:

        $ hg rm --after b/b

      Should succeed - shadow removed:

        $ hg add b

      Look what we got:

        $ hg st

        A a/a

        A b

        R a

        R b/b

      Revert reintroducing shadow - should fail:

        $ rm -r a b

        $ hg revert b/b

        abort: file 'b' in dirstate clashes with 'b/b'

        [255]

      Revert all - should succeed:

        $ hg revert --all

        undeleting a

        forgetting a/a

        forgetting b

        undeleting b/b

        $ hg st

      addremove:

        $ rm -r a b

        $ mkdir a

        $ echo a > a/a

        $ echo b > b

        $ hg addremove -s 0

        removing a

        adding a/a

        adding b

        removing b/b

        $ hg st

        A a/a

        A b

        R a

        R b/b

      commit:

        $ hg ci -A -m "a is dir, b is file"

        $ hg st --all

        C a/a

        C b

      Long directory replaced with file:

        $ mkdir d

        $ mkdir d/d

        $ echo d > d/d/d

        $ hg commit -A -m "d is long directory"

        adding d/d/d

        $ rm -r d

        $ echo d > d

      Should fail - would corrupt dirstate:

        $ hg add d

        abort: directory 'd' already in dirstate

        [255]

      Removing shadow:

        $ hg rm --after d/d/d

      Should succeed - shadow removed:

        $ hg add d

        $ hg ci -md

      Update should work at least with clean working directory:

        $ rm -r a b d

        $ hg up -r 0

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

        $ hg st --all

        C a

        C b/b

        $ rm -r a b

        $ hg up -r 1

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

        $ hg st --all

        C a/a

        C 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

				http://mercurial.selenic.com/bts/issue660 and:
				http://mercurial.selenic.com/bts/issue322

				$ hg init
				$ echo a > a
				$ mkdir b
				$ echo b > b/b
				$ hg commit -A -m "a is file, b is dir"
				adding a
				adding b/b

				File replaced with directory:

				$ rm a
				$ mkdir a
				$ echo a > a/a

				Should fail - would corrupt dirstate:

				$ hg add a/a
				abort: file 'a' in dirstate clashes with 'a/a'
				[255]

				Removing shadow:

				$ hg rm --after a

				Should succeed - shadow removed:

				$ hg add a/a

				Directory replaced with file:

				$ rm -r b
				$ echo b > b

				Should fail - would corrupt dirstate:

				$ hg add b
				abort: directory 'b' already in dirstate
				[255]

				Removing shadow:

				$ hg rm --after b/b

				Should succeed - shadow removed:

				$ hg add b

				Look what we got:

				$ hg st
				A a/a
				A b
				R a
				R b/b

				Revert reintroducing shadow - should fail:

				$ rm -r a b
				$ hg revert b/b
				abort: file 'b' in dirstate clashes with 'b/b'
				[255]

				Revert all - should succeed:

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

				$ hg st

				addremove:

				$ rm -r a b
				$ mkdir a
				$ echo a > a/a
				$ echo b > b

				$ hg addremove -s 0
				removing a
				adding a/a
				adding b
				removing b/b

				$ hg st
				A a/a
				A b
				R a
				R b/b

				commit:

				$ hg ci -A -m "a is dir, b is file"
				$ hg st --all
				C a/a
				C b

				Long directory replaced with file:

				$ mkdir d
				$ mkdir d/d
				$ echo d > d/d/d
				$ hg commit -A -m "d is long directory"
				adding d/d/d

				$ rm -r d
				$ echo d > d

				Should fail - would corrupt dirstate:

				$ hg add d
				abort: directory 'd' already in dirstate
				[255]

				Removing shadow:

				$ hg rm --after d/d/d

				Should succeed - shadow removed:

				$ hg add d
				$ hg ci -md

				Update should work at least with clean working directory:

				$ rm -r a b d
				$ hg up -r 0
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg st --all
				C a
				C b/b

				$ rm -r a b
				$ hg up -r 1
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg st --all
				C a/a
				C b