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

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r28185:c7e89486

default

Download file

             test-issue1306.t
        
                    96 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1306.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
urls: bulk-change BTS urls to new location

              r26420
            
      https://bz.mercurial-scm.org/1306

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
      Initialize remote repo with branches:

        $ hg init remote

        $ cd remote

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ hg branch br

        marked working directory as branch br

        Matt Mackall
    
branch: warn on branching

              r15615
            
        (branches are permanent and global, did you want a bookmark?)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg ci -Amb

        $ echo c > c

        $ hg ci -Amc

        adding c

        $ hg log

        Peter Arrenbrecht
    
localrepo: reuse parent manifest in commitctx if no files have changed...

              r14162
            
        changeset:   2:ae3d9c30ec50

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        branch:      br

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     c

        Peter Arrenbrecht
    
localrepo: reuse parent manifest in commitctx if no files have changed...

              r14162
            
        changeset:   1:3f7f930ca414

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        branch:      br

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     b

        changeset:   0:cb9a9f314b8b

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     a

        $ cd ..

      Try cloning -r branch:

        $ hg clone -rbr remote local1

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 2 changes to 2 files

        updating to branch br

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg -R local1 parents

        Peter Arrenbrecht
    
localrepo: reuse parent manifest in commitctx if no files have changed...

              r14162
            
        changeset:   2:ae3d9c30ec50

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        branch:      br

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     c

      Try cloning -rother clone#branch:

        $ hg clone -r0 remote#br local2

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 2 changes to 2 files

        updating to branch default

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

        $ hg -R local2 parents

        changeset:   0:cb9a9f314b8b

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     a

      Try cloning -r1 clone#branch:

        $ hg clone -r1 remote#br local3

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 2 changes to 2 files

        updating to branch br

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

        $ hg -R local3 parents

        Peter Arrenbrecht
    
localrepo: reuse parent manifest in commitctx if no files have changed...

              r14162
            
        changeset:   1:3f7f930ca414

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        branch:      br

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     b

	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

Matt Mackall urls: bulk-change BTS urls to new location	r26420	https://bz.mercurial-scm.org/1306
Adrian Buehlmann tests: unify test-issue*	r12195
		Initialize remote repo with branches:

		$ hg init remote
		$ cd remote

		$ echo a > a
		$ hg ci -Ama
		adding a

		$ hg branch br
		marked working directory as branch br
Matt Mackall branch: warn on branching	r15615	(branches are permanent and global, did you want a bookmark?)
Adrian Buehlmann tests: unify test-issue*	r12195	$ hg ci -Amb

		$ echo c > c
		$ hg ci -Amc
		adding c

		$ hg log
Peter Arrenbrecht localrepo: reuse parent manifest in commitctx if no files have changed...	r14162	changeset: 2:ae3d9c30ec50
Adrian Buehlmann tests: unify test-issue*	r12195	branch: br
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: c

Peter Arrenbrecht localrepo: reuse parent manifest in commitctx if no files have changed...	r14162	changeset: 1:3f7f930ca414
Adrian Buehlmann tests: unify test-issue*	r12195	branch: br
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: b

		changeset: 0:cb9a9f314b8b
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a


		$ cd ..

		Try cloning -r branch:

		$ hg clone -rbr remote local1
		adding changesets
		adding manifests
		adding file changes
		added 3 changesets with 2 changes to 2 files
		updating to branch br
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ hg -R local1 parents
Peter Arrenbrecht localrepo: reuse parent manifest in commitctx if no files have changed...	r14162	changeset: 2:ae3d9c30ec50
Adrian Buehlmann tests: unify test-issue*	r12195	branch: br
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: c


		Try cloning -rother clone#branch:

		$ hg clone -r0 remote#br local2
		adding changesets
		adding manifests
		adding file changes
		added 3 changesets with 2 changes to 2 files
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ hg -R local2 parents
		changeset: 0:cb9a9f314b8b
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a


		Try cloning -r1 clone#branch:

		$ hg clone -r1 remote#br local3
		adding changesets
		adding manifests
		adding file changes
		added 3 changesets with 2 changes to 2 files
		updating to branch br
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ hg -R local3 parents
Peter Arrenbrecht localrepo: reuse parent manifest in commitctx if no files have changed...	r14162	changeset: 1:3f7f930ca414
Adrian Buehlmann tests: unify test-issue*	r12195	branch: br
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: b