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

timeless@mozdev.org - - Load All Authors

File last commit:

r17486:73e3e368 default


                r28185:c7e89486

default

Download file

             test-diff-issue2761.t
        
                    23 lines
            
             | 442 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-issue2761.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test issue2761

        $ hg init

        $ touch to-be-deleted

        $ hg add

        adding to-be-deleted

        $ hg ci -m first

        $ echo a > to-be-deleted

        $ hg ci -m second

        $ rm to-be-deleted

        $ hg diff -r 0

      Same issue, different code path

        $ hg up -C

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

        $ touch does-not-exist-in-1

        $ hg add

        adding does-not-exist-in-1

        $ hg ci -m third

        $ rm does-not-exist-in-1

        $ hg diff -r 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

				Test issue2761

				$ hg init

				$ touch to-be-deleted
				$ hg add
				adding to-be-deleted
				$ hg ci -m first
				$ echo a > to-be-deleted
				$ hg ci -m second
				$ rm to-be-deleted
				$ hg diff -r 0

				Same issue, different code path

				$ hg up -C
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ touch does-not-exist-in-1
				$ hg add
				adding does-not-exist-in-1
				$ hg ci -m third
				$ rm does-not-exist-in-1
				$ hg diff -r 1