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

context: possibly yield initial fctx in blockdescendants()...

context: possibly yield initial fctx in blockdescendants() If initial 'fctx' has changes in line range with respect to its parents, we yield it first. This makes 'followlines(..., descend=True)' consistent with 'descendants()' revset which yields the starting revision. We reuse one iteration of blockancestors() which does exactly what we want. In test-annotate.t, adjust 'startrev' in one case to cover the situation where the starting revision does not touch specified line range.

Siddharth Agarwal - - Load All Authors

File last commit:

r26614:ef1eb6df default


                r31992:3e47a40d

default

Download file

             test-bookmarks-rebase.t
        
                    105 lines
            
             | 2.5 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

        Sean Farley
    
bookmarks: fix bug that activated a bookmark even with -r passed...

              r19112
            
        $ hg up -q two

        Martin Geisler
    
tests: unify test-bookmarks-rebase

              r11863
            
      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
    
rebase: show more useful status information while rebasing...

              r23517
            
        rebasing 3:2ae46b1d99a7 "3" (tip two)

        Durham Goode
    
bundles: do not overwrite existing backup bundles (BC)...

              r23835
            
        saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-backup.hg (glob)

        Martin Geisler
    
tests: unify test-bookmarks-rebase

              r11863
            
        $ hg log

        Pierre-Yves David
    
rebase: do not add second parent to rebased changeset (drop detach option) (BC)...

              r17005
            
        changeset:   3:42e5ed2cdcf4

        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

        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

        Tony Tung
    
rebase: restore bookmark state on abort...

              r24758
            
      aborted rebase should restore active bookmark.

        $ hg up 1

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

        (leaving bookmark two)

        $ echo 'e' > d

        $ hg ci -A -m "4"

        adding d

        created new head

        $ hg bookmark three

        $ hg rebase -s three -d two

        rebasing 4:dd7c838e8362 "4" (tip three)

        merging d

        Siddharth Agarwal
    
simplemerge: move conflict warning message to filemerge...

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

        Tony Tung
    
rebase: restore bookmark state on abort...

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

        [1]

        $ hg rebase --abort

        rebase aborted

        $ hg bookmark

           one                       1:925d80f479bb

         * three                     4:dd7c838e8362

           two                       3:42e5ed2cdcf4

        Tony Tung
    
rebase: check that the bookmark is still valid when restoring (issue4669)...

              r25101
            
      after aborted rebase, restoring a bookmark that has been removed should not fail

        $ hg rebase -s three -d two

        rebasing 4:dd7c838e8362 "4" (tip three)

        merging d

        Siddharth Agarwal
    
simplemerge: move conflict warning message to filemerge...

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

        Tony Tung
    
rebase: check that the bookmark is still valid when restoring (issue4669)...

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

        [1]

        $ hg bookmark -d three

        $ hg rebase --abort

        rebase aborted

        $ hg bookmark

           one                       1:925d80f479bb

           two                       3:42e5ed2cdcf4

	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
Sean Farley bookmarks: fix bug that activated a bookmark even with -r passed...	r19112	$ hg up -q two
Martin Geisler tests: unify test-bookmarks-rebase	r11863
		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 rebase: show more useful status information while rebasing...	r23517	rebasing 3:2ae46b1d99a7 "3" (tip two)
Durham Goode bundles: do not overwrite existing backup bundles (BC)...	r23835	saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-backup.hg (glob)
Martin Geisler tests: unify test-bookmarks-rebase	r11863
		$ hg log
Pierre-Yves David rebase: do not add second parent to rebased changeset (drop detach option) (BC)...	r17005	changeset: 3:42e5ed2cdcf4
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
		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

Tony Tung rebase: restore bookmark state on abort...	r24758	aborted rebase should restore active bookmark.

		$ hg up 1
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		(leaving bookmark two)
		$ echo 'e' > d
		$ hg ci -A -m "4"
		adding d
		created new head
		$ hg bookmark three
		$ hg rebase -s three -d two
		rebasing 4:dd7c838e8362 "4" (tip three)
		merging d
Siddharth Agarwal simplemerge: move conflict warning message to filemerge...	r26614	warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
Tony Tung rebase: restore bookmark state on abort...	r24758	unresolved conflicts (see hg resolve, then hg rebase --continue)
		[1]
		$ hg rebase --abort
		rebase aborted
		$ hg bookmark
		one 1:925d80f479bb
		* three 4:dd7c838e8362
		two 3:42e5ed2cdcf4

Tony Tung rebase: check that the bookmark is still valid when restoring (issue4669)...	r25101	after aborted rebase, restoring a bookmark that has been removed should not fail

		$ hg rebase -s three -d two
		rebasing 4:dd7c838e8362 "4" (tip three)
		merging d
Siddharth Agarwal simplemerge: move conflict warning message to filemerge...	r26614	warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
Tony Tung rebase: check that the bookmark is still valid when restoring (issue4669)...	r25101	unresolved conflicts (see hg resolve, then hg rebase --continue)
		[1]
		$ hg bookmark -d three
		$ hg rebase --abort
		rebase aborted
		$ hg bookmark
		one 1:925d80f479bb
		two 3:42e5ed2cdcf4