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

largefiles: unlink standins not known to the restored dirstate at rollback...

largefiles: unlink standins not known to the restored dirstate at rollback Before this patch, standinds not known to the restored dirstate at rollback still exist after rollback of the parent of the working directory, and they become orphans unexpectedly. This patch unlinks standins not known to the restored dirstate. This patch saves names of standins matched against not "repo.dirstate[f] == 'a'" but "repo.dirstate[f] != 'r'" before rollback, because branch merging marks files newly added to dirstate as not "a" but "n". Such standins will also become orphan after rollback, because they are not known to the restored dirstate.

Sean Farley - - Load All Authors

File last commit:

r19112:23f785b3 2.6 stable


                r22286:3f3b9483

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

        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
    
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

        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

	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 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
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