upstream/mercurial-mirror Files · tests/test-rebase-abort.t

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)...

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403) This patch avoids empty commit when .hgsubstate is dirty. Empty commit was caused by .hgsubstate being updated back to the state of the working copy parent when committing, if a user had changed it manually and not made any changes in subrepositories. The subrepository state from the working copies parent is compared with the state calculated as a result of trying to commit the subrepositories. If the two states are the same, then return None otherwise the commit is just done. The line: "committing subrepository x" will be written if there is nothing committed, but .hgsubstate is dirty for x subrepository.

Steve Borho - - Load All Authors

File last commit:

r12896:b19b4c1d stable


                r13155:f02d7a56

default

Download file

             test-rebase-abort.t
        
                    148 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-abort.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 a

        $ cd a

        $ echo c1 > common

        $ hg add common

        $ hg ci -m C1

        $ echo c2 >> common

        $ hg ci -m C2

        $ echo c3 >> common

        $ hg ci -m C3

        $ hg up -q -C 1

        $ echo l1 >> extra

        $ hg add extra

        $ hg ci -m L1

        created new head

        $ sed -e 's/c2/l2/' common > common.new

        $ mv common.new common

        $ hg ci -m L2

        $ hg tglog

        @  4: 'L2'

        |

        o  3: 'L1'

        |

        | o  2: 'C3'

        |/

        o  1: 'C2'

        |

        o  0: 'C1'

      Conflicting rebase:

        $ hg rebase -s 3 -d 2

        merging common

        warning: conflicts during merge.

        merging common failed!

        abort: unresolved conflicts (see hg resolve, then hg rebase --continue)

        [255]

      Abort:

        $ hg rebase --abort

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

        rebase aborted

        $ hg tglog

        @  4: 'L2'

        |

        o  3: 'L1'

        |

        | o  2: 'C3'

        |/

        o  1: 'C2'

        |

        o  0: 'C1'

        $ cd ..

      Constrcut new repo:

        $ hg init b

        $ cd b

        $ echo a > a

        $ hg ci -Am A

        adding a

        $ echo b > b

        $ hg ci -Am B

        adding b

        $ echo c > c

        $ hg ci -Am C

        adding c

        $ hg up -q 0

        $ echo b > b

        $ hg ci -Am 'B bis'

        adding b

        created new head

        $ echo c1 > c

        $ hg ci -Am C1

        adding c

      Rebase and abort without generating new changesets:

        $ hg tglog

        @  4: 'C1'

        |

        o  3: 'B bis'

        |

        | o  2: 'C'

        | |

        | o  1: 'B'

        |/

        o  0: 'A'

        $ hg rebase -b 4 -d 2

        merging c

        warning: conflicts during merge.

        merging c failed!

        abort: unresolved conflicts (see hg resolve, then hg rebase --continue)

        [255]

        $ hg tglog

        @  4: 'C1'

        |

        o  3: 'B bis'

        |

        | @  2: 'C'

        | |

        | o  1: 'B'

        |/

        o  0: 'A'

        $ hg rebase -a

        rebase aborted

        $ hg tglog

        @  4: 'C1'

        |

        o  3: 'B bis'

        |

        | o  2: 'C'

        | |

        | o  1: 'B'

        |/

        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 a
				$ cd a

				$ echo c1 > common
				$ hg add common
				$ hg ci -m C1

				$ echo c2 >> common
				$ hg ci -m C2

				$ echo c3 >> common
				$ hg ci -m C3

				$ hg up -q -C 1

				$ echo l1 >> extra
				$ hg add extra
				$ hg ci -m L1
				created new head

				$ sed -e 's/c2/l2/' common > common.new
				$ mv common.new common
				$ hg ci -m L2

				$ hg tglog
				@ 4: 'L2'
				\|
				o 3: 'L1'
				\|
				\| o 2: 'C3'
				\|/
				o 1: 'C2'
				\|
				o 0: 'C1'


				Conflicting rebase:

				$ hg rebase -s 3 -d 2
				merging common
				warning: conflicts during merge.
				merging common failed!
				abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
				[255]

				Abort:

				$ hg rebase --abort
				saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
				rebase aborted

				$ hg tglog
				@ 4: 'L2'
				\|
				o 3: 'L1'
				\|
				\| o 2: 'C3'
				\|/
				o 1: 'C2'
				\|
				o 0: 'C1'

				$ cd ..


				Constrcut new repo:

				$ hg init b
				$ cd b

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

				$ echo b > b
				$ hg ci -Am B
				adding b

				$ echo c > c
				$ hg ci -Am C
				adding c

				$ hg up -q 0

				$ echo b > b
				$ hg ci -Am 'B bis'
				adding b
				created new head

				$ echo c1 > c
				$ hg ci -Am C1
				adding c

				Rebase and abort without generating new changesets:

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

				$ hg rebase -b 4 -d 2
				merging c
				warning: conflicts during merge.
				merging c failed!
				abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
				[255]

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

				$ hg rebase -a
				rebase aborted

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