upstream/mercurial-mirror Files · tests/test-issue1438.t

bookmarks: pull --update updates to active bookmark if it moved (issue4007)...

bookmarks: pull --update updates to active bookmark if it moved (issue4007) This makes `hg pull --update` behave the same wrt the active bookmark as `hg pull && hg update` does as of 2096e025a728. A helper function, bookmarks.calculateupdate, is added to prevent code duplication between postincoming and update.

Matt Mackall - - Load All Authors

File last commit:

r12328:b63f6422 default


                r19523:f37b5a17

2.7 stable

Download file

             test-issue1438.t
        
                    23 lines
            
             | 400 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1438.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      http://mercurial.selenic.com/bts/issue1438

        $ "$TESTDIR/hghave" symlink || exit 80

        $ hg init

        $ ln -s foo link

        $ hg add link

        $ hg ci -mbad link

        $ hg rm link

        $ hg ci -mok

        $ hg diff -g -r 0:1 > bad.patch

        $ hg up 0

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

        $ hg import --no-commit bad.patch

        applying bad.patch

        $ hg status

        R link

        ? bad.patch

	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

				http://mercurial.selenic.com/bts/issue1438

				$ "$TESTDIR/hghave" symlink \|\| exit 80

				$ hg init

				$ ln -s foo link
				$ hg add link
				$ hg ci -mbad link
				$ hg rm link
				$ hg ci -mok
				$ hg diff -g -r 0:1 > bad.patch

				$ hg up 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg import --no-commit bad.patch
				applying bad.patch

				$ hg status
				R link
				? bad.patch