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

rebase: don't mark file as removed if missing in parent's manifest (issue2725)

David Soria Parra - - Load All Authors

File last commit:

r13469:07a6460f stable


                r13778:46c30432

default

Download file

             test-bookmarks-rebase.t
        
                    67 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-bookmarks-rebase.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: unify test-bookmarks-rebase

              r11863
            
        $ echo "[extensions]" >> $HGRCPATH

        $ echo "rebase=" >> $HGRCPATH

      initialize repository

        $ hg init

        $ echo 'a' > a

        $ hg ci -A -m "0"

        adding a

        $ echo 'b' > b

        $ hg ci -A -m "1"

        adding b

        $ hg up 0

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

        $ echo 'c' > c

        $ hg ci -A -m "2"

        adding c

        created new head

        $ echo 'd' > d

        $ hg ci -A -m "3"

        adding d

        $ hg bookmark -r 1 one

        $ hg bookmark -r 3 two

      bookmark list

        $ hg bookmark

        David Soria Parra
    
localrepo: sort hg bookmark output...

              r13388
            
           one                       1:925d80f479bb

        Martin Geisler
    
tests: unify test-bookmarks-rebase

              r11863
            
         * two                       3:2ae46b1d99a7

      rebase

        Nicolas Dumazet
    
tests: use regular expressions instead of helpers

              r11907
            
        $ hg rebase -s two -d one

        Mads Kiilerich
    
tests: remove redundant globs...

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

        Martin Geisler
    
tests: unify test-bookmarks-rebase

              r11863
            
        $ hg log

        changeset:   3:9163974d1cb5

        David Soria Parra
    
templater: add bookmarks to templates and default output...

              r13386
            
        bookmark:    two

        Martin Geisler
    
tests: unify test-bookmarks-rebase

              r11863
            
        tag:         tip

        parent:      1:925d80f479bb

        parent:      2:db815d6d32e6

        user:        test

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

        summary:     3

        changeset:   2:db815d6d32e6

        parent:      0:f7b1eb17ad24

        user:        test

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

        summary:     2

        changeset:   1:925d80f479bb

        David Soria Parra
    
bookmarks: make track.current=True default behaviour and remove option (BC)

              r13416
            
        bookmark:    one

        Martin Geisler
    
tests: unify test-bookmarks-rebase

              r11863
            
        user:        test

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

        summary:     1

        changeset:   0:f7b1eb17ad24

        user:        test

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

        summary:     0

	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-bookmarks-rebase	r11863	$ echo "[extensions]" >> $HGRCPATH
		$ echo "rebase=" >> $HGRCPATH

		initialize repository

		$ hg init

		$ echo 'a' > a
		$ hg ci -A -m "0"
		adding a

		$ echo 'b' > b
		$ hg ci -A -m "1"
		adding b

		$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ echo 'c' > c
		$ hg ci -A -m "2"
		adding c
		created new head

		$ echo 'd' > d
		$ hg ci -A -m "3"
		adding d

		$ hg bookmark -r 1 one
		$ hg bookmark -r 3 two

		bookmark list

		$ hg bookmark
David Soria Parra localrepo: sort hg bookmark output...	r13388	one 1:925d80f479bb
Martin Geisler tests: unify test-bookmarks-rebase	r11863	* two 3:2ae46b1d99a7

		rebase

Nicolas Dumazet tests: use regular expressions instead of helpers	r11907	$ hg rebase -s two -d one
Mads Kiilerich tests: remove redundant globs...	r12640	saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)
Martin Geisler tests: unify test-bookmarks-rebase	r11863
		$ hg log
		changeset: 3:9163974d1cb5
David Soria Parra templater: add bookmarks to templates and default output...	r13386	bookmark: two
Martin Geisler tests: unify test-bookmarks-rebase	r11863	tag: tip
		parent: 1:925d80f479bb
		parent: 2:db815d6d32e6
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: 3

		changeset: 2:db815d6d32e6
		parent: 0:f7b1eb17ad24
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: 2

		changeset: 1:925d80f479bb
David Soria Parra bookmarks: make track.current=True default behaviour and remove option (BC)	r13416	bookmark: one
Martin Geisler tests: unify test-bookmarks-rebase	r11863	user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: 1

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