upstream/mercurial-mirror Files · tests/test-rebase-newancestor.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

Mads Kiilerich - - Load All Authors

File last commit:

r12640:6cc4b14f default


                r15321:e174353e

stable

Download file

             test-rebase-newancestor.t
        
                    54 lines
            
             | 691 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-newancestor.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > graphlog=

        > rebase=

        > 

        > [alias]

        > tglog = log -G --template "{rev}: '{desc}' {branches}\n"

        > EOF

        $ hg init repo

        $ cd repo

        $ echo A > a

        $ echo >> a

        $ hg ci -Am A

        adding a

        $ echo B > a

        $ echo >> a

        $ hg ci -m B

        $ echo C > a

        $ echo >> a

        $ hg ci -m C

        $ hg up -q -C 0

        $ echo D >> a

        $ hg ci -Am AD

        created new head

        $ hg tglog

        @  3: 'AD'

        |

        | o  2: 'C'

        | |

        | o  1: 'B'

        |/

        o  0: 'A'

        $ hg rebase -s 1 -d 3

        merging a

        merging a

        saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob)

        $ hg tglog

        @  3: 'C'

        |

        o  2: 'B'

        |

        o  1: 'AD'

        |

        o  0: 'A'

	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

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> graphlog=
				> rebase=
				>
				> [alias]
				> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
				> EOF

				$ hg init repo
				$ cd repo

				$ echo A > a
				$ echo >> a
				$ hg ci -Am A
				adding a

				$ echo B > a
				$ echo >> a
				$ hg ci -m B

				$ echo C > a
				$ echo >> a
				$ hg ci -m C

				$ hg up -q -C 0

				$ echo D >> a
				$ hg ci -Am AD
				created new head

				$ hg tglog
				@ 3: 'AD'
				\|
				\| o 2: 'C'
				\| \|
				\| o 1: 'B'
				\|/
				o 0: 'A'

				$ hg rebase -s 1 -d 3
				merging a
				merging a
				saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 3: 'C'
				\|
				o 2: 'B'
				\|
				o 1: 'AD'
				\|
				o 0: 'A'