upstream/mercurial-mirror Files · tests/test-backwards-remove.t

rebase: adds storing collapse message (issue4792)...

rebase: adds storing collapse message (issue4792) Before this patch collapse message wasn't stored so when you ran into the merge conflict while rebasing, running rebase --continue didn't remember the message and always opened editor to fill commit message. This patch adds saving collapse message in .hg/last-message.txt and restoring it later when needed.

Martin Geisler - - Load All Authors

File last commit:

r12156:4c94b6d0 default


                r28185:c7e89486

default

Download file

             test-backwards-remove.t
        
                    16 lines
            
             | 280 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-backwards-remove.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: unify test-backwards-remove

              r11857
            
        $ hg init

        $ echo This is file a1 > a

        $ hg add a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m "commit #0"

        Martin Geisler
    
tests: unify test-backwards-remove

              r11857
            
        $ ls

        a

        $ echo This is file b1 > b

        $ hg add b

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m "commit #1"

        Martin Geisler
    
tests: unify test-backwards-remove

              r11857
            
        $ hg co 0

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

      B should disappear

        $ ls

        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

Martin Geisler tests: unify test-backwards-remove	r11857	$ hg init
		$ echo This is file a1 > a
		$ hg add a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit #0"
Martin Geisler tests: unify test-backwards-remove	r11857	$ ls
		a
		$ echo This is file b1 > b
		$ hg add b
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit #1"
Martin Geisler tests: unify test-backwards-remove	r11857	$ hg co 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved

		B should disappear

		$ ls
		a