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

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.

Sean Farley - - Load All Authors

File last commit:

r19112:23f785b3 2.6 stable


                r22287:f3ac9677

default

Download file

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

        $ 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

        $ hg up -q two

      bookmark list

        $ hg bookmark

           one                       1:925d80f479bb

         * two                       3:2ae46b1d99a7

      rebase

        $ hg rebase -s two -d one

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

        $ hg log

        changeset:   3:42e5ed2cdcf4

        bookmark:    two

        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

        bookmark:    one

        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

				$ 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
				$ hg up -q two

				bookmark list

				$ hg bookmark
				one 1:925d80f479bb
				* two 3:2ae46b1d99a7

				rebase

				$ hg rebase -s two -d one
				saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)

				$ hg log
				changeset: 3:42e5ed2cdcf4
				bookmark: two
				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
				bookmark: one
				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