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

sshpeer: initial definition and implementation of new SSH protocol...

sshpeer: initial definition and implementation of new SSH protocol The existing SSH protocol has several design flaws. Future commits will elaborate on these flaws as new features are introduced to combat these flaws. For now, hopefully you can take me for my word that a ground up rewrite of the SSH protocol is needed. This commit lays the foundation for a new SSH protocol by defining a mechanism to upgrade the SSH transport channel away from the default (version 1) protocol to something modern (which we'll call "version 2" for now). This upgrade process is detailed in the internals documentation for the wire protocol. The gist of it is the client sends a request line preceding the "hello" command/line which basically says "I'm requesting an upgrade: here's what I support." If the server recognizes that line, it processes the upgrade request and the transport channel is switched to use the new version of the protocol. If not, it sends an empty response, which is how all Mercurial SSH servers from the beginning of time reacted to unknown commands. The upgrade request is effectively ignored and the client continues to use the existing version of the protocol as if nothing happened. The new version of the SSH protocol is completely identical to version 1 aside from the upgrade dance and the bytes that follow. The immediate bytes that follow the protocol switch are defined to be a length framed "capabilities: " line containing the remote's advertised capabilities. In reality, this looks very similar to what the "hello" response would look like. But it will evolve quickly. The methodology by which the protocol will evolve is important. I'm not going to introduce the new protocol all at once. That would likely lead to endless bike shedding and forward progress would stall. Instead, I intend to tricle out new features and diversions from the existing protocol in small, incremental changes. To support the gradual evolution of the protocol, the on-the-wire advertised protocol name contains an "exp" to denote "experimental" and a 4 digit field to capture the sub-version of the protocol. Whenever we make a BC change to the wire protocol, we can increment this version and lock out all older clients because it will appear as a completely different protocol version. This means we can incur as many breaking changes as we want. We don't have to commit to supporting any one feature or idea for a long period of time. We can even evolve the handshake mechanism, because that is defined as being an implementation detail of the negotiated protocol version! Hopefully this lowers the barrier to accepting changes to the protocol and for experimenting with "radical" ideas during its development. In core, sshpeer received most of the attention. We haven't even implemented the server bits for the new protocol in core yet. Instead, we add very primitive support to our test server, mainly just to exercise the added code paths in sshpeer. Differential Revision: https://phab.mercurial-scm.org/D2061 # no-check-commit because of required foo_bar naming

Phil Cohen - - Load All Authors

File last commit:

r35386:469b06b4 default


                r35994:48a3a928

default

Download file

             test-rebase-interruptions.t
        
                    465 lines
            
             | 9.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-interruptions.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > 

        > [phases]

        > publish=False

        > 

        > [alias]

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

        > tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n"

        > EOF

        $ hg init a

        $ cd a

        $ echo A > A

        $ hg ci -Am A

        adding A

        $ echo B > B

        $ hg ci -Am B

        adding B

        $ echo C >> A

        $ hg ci -m C

        $ hg up -q -C 0

        $ echo D >> A

        $ hg ci -m D

        created new head

        $ echo E > E

        $ hg ci -Am E

        adding E

        $ cd ..

      Changes during an interruption - continue:

        $ hg clone -q -u . a a1

        $ cd a1

        $ hg tglog

        @  4: ae36e8e3dfd7 'E'

        |

        o  3: 46b37eabc604 'D'

        |

        | o  2: 965c486023db 'C'

        | |

        | o  1: 27547f69f254 'B'

        |/

        o  0: 4a2df7238c3b 'A'

      Rebasing B onto E:

        $ hg rebase -s 1 -d 4

        rebasing 1:27547f69f254 "B"

        rebasing 2:965c486023db "C"

        merging A

        warning: conflicts while merging A! (edit, then use 'hg resolve --mark')

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

        [1]

      Force a commit on C during the interruption:

        $ hg up -q -C 2 --config 'extensions.rebase=!'

        $ echo 'Extra' > Extra

        $ hg add Extra

        $ hg ci -m 'Extra' --config 'extensions.rebase=!'

      Force this commit onto secret phase

        $ hg phase --force --secret 6

        $ hg tglogp

        @  6: deb5d2f93d8b secret 'Extra'

        |

        | o  5: 45396c49d53b draft 'B'

        | |

        | o  4: ae36e8e3dfd7 draft 'E'

        | |

        | o  3: 46b37eabc604 draft 'D'

        | |

        o |  2: 965c486023db draft 'C'

        | |

        o |  1: 27547f69f254 draft 'B'

        |/

        o  0: 4a2df7238c3b draft 'A'

      Resume the rebasing:

        $ hg rebase --continue

        already rebased 1:27547f69f254 "B" as 45396c49d53b

        rebasing 2:965c486023db "C"

        merging A

        warning: conflicts while merging A! (edit, then use 'hg resolve --mark')

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

        [1]

      Solve the conflict and go on:

        $ echo 'conflict solved' > A

        $ rm A.orig

        $ hg resolve -m A

        (no more unresolved files)

        continue: hg rebase --continue

        $ hg rebase --continue

        already rebased 1:27547f69f254 "B" as 45396c49d53b

        rebasing 2:965c486023db "C"

        warning: orphaned descendants detected, not stripping 27547f69f254, 965c486023db

        $ hg tglogp

        o  7: d2d25e26288e draft 'C'

        |

        | o  6: deb5d2f93d8b secret 'Extra'

        | |

        o |  5: 45396c49d53b draft 'B'

        | |

        @ |  4: ae36e8e3dfd7 draft 'E'

        | |

        o |  3: 46b37eabc604 draft 'D'

        | |

        | o  2: 965c486023db draft 'C'

        | |

        | o  1: 27547f69f254 draft 'B'

        |/

        o  0: 4a2df7238c3b draft 'A'

        $ cd ..

      Changes during an interruption - abort:

        $ hg clone -q -u . a a2

        $ cd a2

        $ hg tglog

        @  4: ae36e8e3dfd7 'E'

        |

        o  3: 46b37eabc604 'D'

        |

        | o  2: 965c486023db 'C'

        | |

        | o  1: 27547f69f254 'B'

        |/

        o  0: 4a2df7238c3b 'A'

      Rebasing B onto E:

        $ hg rebase -s 1 -d 4

        rebasing 1:27547f69f254 "B"

        rebasing 2:965c486023db "C"

        merging A

        warning: conflicts while merging A! (edit, then use 'hg resolve --mark')

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

        [1]

      Force a commit on B' during the interruption:

        $ hg up -q -C 5 --config 'extensions.rebase=!'

        $ echo 'Extra' > Extra

        $ hg add Extra

        $ hg ci -m 'Extra' --config 'extensions.rebase=!'

        $ hg tglog

        @  6: 402ee3642b59 'Extra'

        |

        o  5: 45396c49d53b 'B'

        |

        o  4: ae36e8e3dfd7 'E'

        |

        o  3: 46b37eabc604 'D'

        |

        | o  2: 965c486023db 'C'

        | |

        | o  1: 27547f69f254 'B'

        |/

        o  0: 4a2df7238c3b 'A'

      Abort the rebasing:

        $ hg rebase --abort

        warning: new changesets detected on destination branch, can't strip

        rebase aborted

        $ hg tglog

        @  6: 402ee3642b59 'Extra'

        |

        o  5: 45396c49d53b 'B'

        |

        o  4: ae36e8e3dfd7 'E'

        |

        o  3: 46b37eabc604 'D'

        |

        | o  2: 965c486023db 'C'

        | |

        | o  1: 27547f69f254 'B'

        |/

        o  0: 4a2df7238c3b 'A'

        $ cd ..

      Changes during an interruption - abort (again):

        $ hg clone -q -u . a a3

        $ cd a3

        $ hg tglogp

        @  4: ae36e8e3dfd7 draft 'E'

        |

        o  3: 46b37eabc604 draft 'D'

        |

        | o  2: 965c486023db draft 'C'

        | |

        | o  1: 27547f69f254 draft 'B'

        |/

        o  0: 4a2df7238c3b draft 'A'

      Rebasing B onto E:

        $ hg rebase -s 1 -d 4

        rebasing 1:27547f69f254 "B"

        rebasing 2:965c486023db "C"

        merging A

        warning: conflicts while merging A! (edit, then use 'hg resolve --mark')

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

        [1]

      Change phase on B and B'

        $ hg up -q -C 5 --config 'extensions.rebase=!'

        $ hg phase --public 1

        $ hg phase --public 5

        $ hg phase --secret -f 2

        $ hg tglogp

        @  5: 45396c49d53b public 'B'

        |

        o  4: ae36e8e3dfd7 public 'E'

        |

        o  3: 46b37eabc604 public 'D'

        |

        | o  2: 965c486023db secret 'C'

        | |

        | o  1: 27547f69f254 public 'B'

        |/

        o  0: 4a2df7238c3b public 'A'

      Abort the rebasing:

        $ hg rebase --abort

        warning: can't clean up public changesets 45396c49d53b

        rebase aborted

        $ hg tglogp

        @  5: 45396c49d53b public 'B'

        |

        o  4: ae36e8e3dfd7 public 'E'

        |

        o  3: 46b37eabc604 public 'D'

        |

        | o  2: 965c486023db secret 'C'

        | |

        | o  1: 27547f69f254 public 'B'

        |/

        o  0: 4a2df7238c3b public 'A'

      Test rebase interrupted by hooks

        $ hg up 2

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

        $ echo F > F

        $ hg add F

        $ hg ci -m F

        $ cd ..

      (precommit version)

        $ cp -R a3 hook-precommit

        $ cd hook-precommit

        $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"'

        rebasing 2:965c486023db "C"

        M A

        rebasing 6:a0b2430ebfb8 "F" (tip)

        abort: precommit hook exited with status 1

        [255]

        $ hg tglogp

        @  7: 401ccec5e39f secret 'C'

        |

        | @  6: a0b2430ebfb8 secret 'F'

        | |

        o |  5: 45396c49d53b public 'B'

        | |

        o |  4: ae36e8e3dfd7 public 'E'

        | |

        o |  3: 46b37eabc604 public 'D'

        | |

        | o  2: 965c486023db secret 'C'

        | |

        | o  1: 27547f69f254 public 'B'

        |/

        o  0: 4a2df7238c3b public 'A'

        $ hg rebase --continue

        already rebased 2:965c486023db "C" as 401ccec5e39f

        rebasing 6:a0b2430ebfb8 "F"

        saved backup bundle to $TESTTMP/hook-precommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg

        $ hg tglogp

        @  6: 6e92a149ac6b secret 'F'

        |

        o  5: 401ccec5e39f secret 'C'

        |

        o  4: 45396c49d53b public 'B'

        |

        o  3: ae36e8e3dfd7 public 'E'

        |

        o  2: 46b37eabc604 public 'D'

        |

        | o  1: 27547f69f254 public 'B'

        |/

        o  0: 4a2df7238c3b public 'A'

        $ cd ..

      (pretxncommit version)

        $ cp -R a3 hook-pretxncommit

        $ cd hook-pretxncommit

      #if windows

        $ NODE="%HG_NODE%"

      #else

        $ NODE="\$HG_NODE"

      #endif

        $ hg rebase --source 2 --dest 5 --tool internal:other --config "hooks.pretxncommit=hg log -r $NODE | grep \"summary:     C\""

        rebasing 2:965c486023db "C"

        summary:     C

        rebasing 6:a0b2430ebfb8 "F" (tip)

        transaction abort!

        rollback completed

        abort: pretxncommit hook exited with status 1

        [255]

        $ hg tglogp

        @  7: 401ccec5e39f secret 'C'

        |

        | @  6: a0b2430ebfb8 secret 'F'

        | |

        o |  5: 45396c49d53b public 'B'

        | |

        o |  4: ae36e8e3dfd7 public 'E'

        | |

        o |  3: 46b37eabc604 public 'D'

        | |

        | o  2: 965c486023db secret 'C'

        | |

        | o  1: 27547f69f254 public 'B'

        |/

        o  0: 4a2df7238c3b public 'A'

        $ hg rebase --continue

        already rebased 2:965c486023db "C" as 401ccec5e39f

        rebasing 6:a0b2430ebfb8 "F"

        saved backup bundle to $TESTTMP/hook-pretxncommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg

        $ hg tglogp

        @  6: 6e92a149ac6b secret 'F'

        |

        o  5: 401ccec5e39f secret 'C'

        |

        o  4: 45396c49d53b public 'B'

        |

        o  3: ae36e8e3dfd7 public 'E'

        |

        o  2: 46b37eabc604 public 'D'

        |

        | o  1: 27547f69f254 public 'B'

        |/

        o  0: 4a2df7238c3b public 'A'

        $ cd ..

      (pretxnclose version)

        $ cp -R a3 hook-pretxnclose

        $ cd hook-pretxnclose

        $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxnclose=hg log -r tip | grep "summary:     C"'

        rebasing 2:965c486023db "C"

        summary:     C

        rebasing 6:a0b2430ebfb8 "F" (tip)

        transaction abort!

        rollback completed

        abort: pretxnclose hook exited with status 1

        [255]

        $ hg tglogp

        @  7: 401ccec5e39f secret 'C'

        |

        | @  6: a0b2430ebfb8 secret 'F'

        | |

        o |  5: 45396c49d53b public 'B'

        | |

        o |  4: ae36e8e3dfd7 public 'E'

        | |

        o |  3: 46b37eabc604 public 'D'

        | |

        | o  2: 965c486023db secret 'C'

        | |

        | o  1: 27547f69f254 public 'B'

        |/

        o  0: 4a2df7238c3b public 'A'

        $ hg rebase --continue

        already rebased 2:965c486023db "C" as 401ccec5e39f

        rebasing 6:a0b2430ebfb8 "F"

        saved backup bundle to $TESTTMP/hook-pretxnclose/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg

        $ hg tglogp

        @  6: 6e92a149ac6b secret 'F'

        |

        o  5: 401ccec5e39f secret 'C'

        |

        o  4: 45396c49d53b public 'B'

        |

        o  3: ae36e8e3dfd7 public 'E'

        |

        o  2: 46b37eabc604 public 'D'

        |

        | o  1: 27547f69f254 public 'B'

        |/

        o  0: 4a2df7238c3b public 'A'

        $ cd ..

      Make sure merge state is cleaned up after a no-op rebase merge (issue5494)

        $ hg init repo

        $ cd repo

        $ echo a > a

        $ hg commit -qAm base

        $ echo b >> a

        $ hg commit -qm b

        $ hg up '.^'

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

        $ echo c >> a

        $ hg commit -qm c

        $ hg rebase -s 1 -d 2 --noninteractive

        rebasing 1:fdaca8533b86 "b"

        merging a

        warning: conflicts while merging a! (edit, then use 'hg resolve --mark')

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

        [1]

        $ echo a > a

        $ echo c >> a

        $ hg resolve --mark a

        (no more unresolved files)

        continue: hg rebase --continue

        $ hg rebase --continue

        rebasing 1:fdaca8533b86 "b"

        note: rebase of 1:fdaca8533b86 created no changes to commit

        saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg

        $ hg resolve --list

        $ test -f .hg/merge

        [1]

	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]
				> rebase=
				>
				> [phases]
				> publish=False
				>
				> [alias]
				> tglog = log -G --template "{rev}: {node\|short} '{desc}' {branches}\n"
				> tglogp = log -G --template "{rev}: {node\|short} {phase} '{desc}' {branches}\n"
				> EOF


				$ hg init a
				$ cd a

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

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

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

				$ hg up -q -C 0

				$ echo D >> A
				$ hg ci -m D
				created new head

				$ echo E > E
				$ hg ci -Am E
				adding E

				$ cd ..


				Changes during an interruption - continue:

				$ hg clone -q -u . a a1
				$ cd a1

				$ hg tglog
				@ 4: ae36e8e3dfd7 'E'
				\|
				o 3: 46b37eabc604 'D'
				\|
				\| o 2: 965c486023db 'C'
				\| \|
				\| o 1: 27547f69f254 'B'
				\|/
				o 0: 4a2df7238c3b 'A'

				Rebasing B onto E:

				$ hg rebase -s 1 -d 4
				rebasing 1:27547f69f254 "B"
				rebasing 2:965c486023db "C"
				merging A
				warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				Force a commit on C during the interruption:

				$ hg up -q -C 2 --config 'extensions.rebase=!'

				$ echo 'Extra' > Extra
				$ hg add Extra
				$ hg ci -m 'Extra' --config 'extensions.rebase=!'

				Force this commit onto secret phase

				$ hg phase --force --secret 6

				$ hg tglogp
				@ 6: deb5d2f93d8b secret 'Extra'
				\|
				\| o 5: 45396c49d53b draft 'B'
				\| \|
				\| o 4: ae36e8e3dfd7 draft 'E'
				\| \|
				\| o 3: 46b37eabc604 draft 'D'
				\| \|
				o \| 2: 965c486023db draft 'C'
				\| \|
				o \| 1: 27547f69f254 draft 'B'
				\|/
				o 0: 4a2df7238c3b draft 'A'

				Resume the rebasing:

				$ hg rebase --continue
				already rebased 1:27547f69f254 "B" as 45396c49d53b
				rebasing 2:965c486023db "C"
				merging A
				warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				Solve the conflict and go on:

				$ echo 'conflict solved' > A
				$ rm A.orig
				$ hg resolve -m A
				(no more unresolved files)
				continue: hg rebase --continue

				$ hg rebase --continue
				already rebased 1:27547f69f254 "B" as 45396c49d53b
				rebasing 2:965c486023db "C"
				warning: orphaned descendants detected, not stripping 27547f69f254, 965c486023db

				$ hg tglogp
				o 7: d2d25e26288e draft 'C'
				\|
				\| o 6: deb5d2f93d8b secret 'Extra'
				\| \|
				o \| 5: 45396c49d53b draft 'B'
				\| \|
				@ \| 4: ae36e8e3dfd7 draft 'E'
				\| \|
				o \| 3: 46b37eabc604 draft 'D'
				\| \|
				\| o 2: 965c486023db draft 'C'
				\| \|
				\| o 1: 27547f69f254 draft 'B'
				\|/
				o 0: 4a2df7238c3b draft 'A'

				$ cd ..


				Changes during an interruption - abort:

				$ hg clone -q -u . a a2
				$ cd a2

				$ hg tglog
				@ 4: ae36e8e3dfd7 'E'
				\|
				o 3: 46b37eabc604 'D'
				\|
				\| o 2: 965c486023db 'C'
				\| \|
				\| o 1: 27547f69f254 'B'
				\|/
				o 0: 4a2df7238c3b 'A'

				Rebasing B onto E:

				$ hg rebase -s 1 -d 4
				rebasing 1:27547f69f254 "B"
				rebasing 2:965c486023db "C"
				merging A
				warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				Force a commit on B' during the interruption:

				$ hg up -q -C 5 --config 'extensions.rebase=!'

				$ echo 'Extra' > Extra
				$ hg add Extra
				$ hg ci -m 'Extra' --config 'extensions.rebase=!'

				$ hg tglog
				@ 6: 402ee3642b59 'Extra'
				\|
				o 5: 45396c49d53b 'B'
				\|
				o 4: ae36e8e3dfd7 'E'
				\|
				o 3: 46b37eabc604 'D'
				\|
				\| o 2: 965c486023db 'C'
				\| \|
				\| o 1: 27547f69f254 'B'
				\|/
				o 0: 4a2df7238c3b 'A'

				Abort the rebasing:

				$ hg rebase --abort
				warning: new changesets detected on destination branch, can't strip
				rebase aborted

				$ hg tglog
				@ 6: 402ee3642b59 'Extra'
				\|
				o 5: 45396c49d53b 'B'
				\|
				o 4: ae36e8e3dfd7 'E'
				\|
				o 3: 46b37eabc604 'D'
				\|
				\| o 2: 965c486023db 'C'
				\| \|
				\| o 1: 27547f69f254 'B'
				\|/
				o 0: 4a2df7238c3b 'A'

				$ cd ..

				Changes during an interruption - abort (again):

				$ hg clone -q -u . a a3
				$ cd a3

				$ hg tglogp
				@ 4: ae36e8e3dfd7 draft 'E'
				\|
				o 3: 46b37eabc604 draft 'D'
				\|
				\| o 2: 965c486023db draft 'C'
				\| \|
				\| o 1: 27547f69f254 draft 'B'
				\|/
				o 0: 4a2df7238c3b draft 'A'

				Rebasing B onto E:

				$ hg rebase -s 1 -d 4
				rebasing 1:27547f69f254 "B"
				rebasing 2:965c486023db "C"
				merging A
				warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				Change phase on B and B'

				$ hg up -q -C 5 --config 'extensions.rebase=!'
				$ hg phase --public 1
				$ hg phase --public 5
				$ hg phase --secret -f 2

				$ hg tglogp
				@ 5: 45396c49d53b public 'B'
				\|
				o 4: ae36e8e3dfd7 public 'E'
				\|
				o 3: 46b37eabc604 public 'D'
				\|
				\| o 2: 965c486023db secret 'C'
				\| \|
				\| o 1: 27547f69f254 public 'B'
				\|/
				o 0: 4a2df7238c3b public 'A'

				Abort the rebasing:

				$ hg rebase --abort
				warning: can't clean up public changesets 45396c49d53b
				rebase aborted

				$ hg tglogp
				@ 5: 45396c49d53b public 'B'
				\|
				o 4: ae36e8e3dfd7 public 'E'
				\|
				o 3: 46b37eabc604 public 'D'
				\|
				\| o 2: 965c486023db secret 'C'
				\| \|
				\| o 1: 27547f69f254 public 'B'
				\|/
				o 0: 4a2df7238c3b public 'A'

				Test rebase interrupted by hooks

				$ hg up 2
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ echo F > F
				$ hg add F
				$ hg ci -m F

				$ cd ..

				(precommit version)

				$ cp -R a3 hook-precommit
				$ cd hook-precommit
				$ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status \| grep "M A"'
				rebasing 2:965c486023db "C"
				M A
				rebasing 6:a0b2430ebfb8 "F" (tip)
				abort: precommit hook exited with status 1
				[255]
				$ hg tglogp
				@ 7: 401ccec5e39f secret 'C'
				\|
				\| @ 6: a0b2430ebfb8 secret 'F'
				\| \|
				o \| 5: 45396c49d53b public 'B'
				\| \|
				o \| 4: ae36e8e3dfd7 public 'E'
				\| \|
				o \| 3: 46b37eabc604 public 'D'
				\| \|
				\| o 2: 965c486023db secret 'C'
				\| \|
				\| o 1: 27547f69f254 public 'B'
				\|/
				o 0: 4a2df7238c3b public 'A'

				$ hg rebase --continue
				already rebased 2:965c486023db "C" as 401ccec5e39f
				rebasing 6:a0b2430ebfb8 "F"
				saved backup bundle to $TESTTMP/hook-precommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg
				$ hg tglogp
				@ 6: 6e92a149ac6b secret 'F'
				\|
				o 5: 401ccec5e39f secret 'C'
				\|
				o 4: 45396c49d53b public 'B'
				\|
				o 3: ae36e8e3dfd7 public 'E'
				\|
				o 2: 46b37eabc604 public 'D'
				\|
				\| o 1: 27547f69f254 public 'B'
				\|/
				o 0: 4a2df7238c3b public 'A'

				$ cd ..

				(pretxncommit version)

				$ cp -R a3 hook-pretxncommit
				$ cd hook-pretxncommit
				#if windows
				$ NODE="%HG_NODE%"
				#else
				$ NODE="\$HG_NODE"
				#endif
				$ hg rebase --source 2 --dest 5 --tool internal:other --config "hooks.pretxncommit=hg log -r $NODE \| grep \"summary: C\""
				rebasing 2:965c486023db "C"
				summary: C
				rebasing 6:a0b2430ebfb8 "F" (tip)
				transaction abort!
				rollback completed
				abort: pretxncommit hook exited with status 1
				[255]
				$ hg tglogp
				@ 7: 401ccec5e39f secret 'C'
				\|
				\| @ 6: a0b2430ebfb8 secret 'F'
				\| \|
				o \| 5: 45396c49d53b public 'B'
				\| \|
				o \| 4: ae36e8e3dfd7 public 'E'
				\| \|
				o \| 3: 46b37eabc604 public 'D'
				\| \|
				\| o 2: 965c486023db secret 'C'
				\| \|
				\| o 1: 27547f69f254 public 'B'
				\|/
				o 0: 4a2df7238c3b public 'A'

				$ hg rebase --continue
				already rebased 2:965c486023db "C" as 401ccec5e39f
				rebasing 6:a0b2430ebfb8 "F"
				saved backup bundle to $TESTTMP/hook-pretxncommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg
				$ hg tglogp
				@ 6: 6e92a149ac6b secret 'F'
				\|
				o 5: 401ccec5e39f secret 'C'
				\|
				o 4: 45396c49d53b public 'B'
				\|
				o 3: ae36e8e3dfd7 public 'E'
				\|
				o 2: 46b37eabc604 public 'D'
				\|
				\| o 1: 27547f69f254 public 'B'
				\|/
				o 0: 4a2df7238c3b public 'A'

				$ cd ..

				(pretxnclose version)

				$ cp -R a3 hook-pretxnclose
				$ cd hook-pretxnclose
				$ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.pretxnclose=hg log -r tip \| grep "summary: C"'
				rebasing 2:965c486023db "C"
				summary: C
				rebasing 6:a0b2430ebfb8 "F" (tip)
				transaction abort!
				rollback completed
				abort: pretxnclose hook exited with status 1
				[255]
				$ hg tglogp
				@ 7: 401ccec5e39f secret 'C'
				\|
				\| @ 6: a0b2430ebfb8 secret 'F'
				\| \|
				o \| 5: 45396c49d53b public 'B'
				\| \|
				o \| 4: ae36e8e3dfd7 public 'E'
				\| \|
				o \| 3: 46b37eabc604 public 'D'
				\| \|
				\| o 2: 965c486023db secret 'C'
				\| \|
				\| o 1: 27547f69f254 public 'B'
				\|/
				o 0: 4a2df7238c3b public 'A'

				$ hg rebase --continue
				already rebased 2:965c486023db "C" as 401ccec5e39f
				rebasing 6:a0b2430ebfb8 "F"
				saved backup bundle to $TESTTMP/hook-pretxnclose/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg
				$ hg tglogp
				@ 6: 6e92a149ac6b secret 'F'
				\|
				o 5: 401ccec5e39f secret 'C'
				\|
				o 4: 45396c49d53b public 'B'
				\|
				o 3: ae36e8e3dfd7 public 'E'
				\|
				o 2: 46b37eabc604 public 'D'
				\|
				\| o 1: 27547f69f254 public 'B'
				\|/
				o 0: 4a2df7238c3b public 'A'

				$ cd ..

				Make sure merge state is cleaned up after a no-op rebase merge (issue5494)
				$ hg init repo
				$ cd repo
				$ echo a > a
				$ hg commit -qAm base
				$ echo b >> a
				$ hg commit -qm b
				$ hg up '.^'
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo c >> a
				$ hg commit -qm c
				$ hg rebase -s 1 -d 2 --noninteractive
				rebasing 1:fdaca8533b86 "b"
				merging a
				warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]
				$ echo a > a
				$ echo c >> a
				$ hg resolve --mark a
				(no more unresolved files)
				continue: hg rebase --continue
				$ hg rebase --continue
				rebasing 1:fdaca8533b86 "b"
				note: rebase of 1:fdaca8533b86 created no changes to commit
				saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
				$ hg resolve --list
				$ test -f .hg/merge
				[1]