upstream/mercurial-mirror Files · tests/test-586.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.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22287:f3ac9677

default

Download file

             test-586.t
        
                    92 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-586.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Issue586: removing remote files after merge appears to corrupt the

      dirstate

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ hg init ../b

        $ cd ../b

        $ echo b > b

        $ hg ci -Amb

        adding b

        $ hg pull -f ../a

        pulling from ../a

        searching for changes

        warning: repository is unrelated

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ hg rm -f a

        $ hg ci -Amc

        $ hg st -A

        C b

        $ cd ..

      Issue1433: Traceback after two unrelated pull, two move, a merge and

      a commit (related to issue586)

      create test repos

        $ hg init repoa

        $ touch repoa/a

        $ hg -R repoa ci -Am adda

        adding a

        $ hg init repob

        $ touch repob/b

        $ hg -R repob ci -Am addb

        adding b

        $ hg init repoc

        $ cd repoc

        $ hg pull ../repoa

        pulling from ../repoa

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        (run 'hg update' to get a working copy)

        $ hg update

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

        $ mkdir tst

        $ hg mv * tst

        $ hg ci -m "import a in tst"

        $ hg pull -f ../repob

        pulling from ../repob

        searching for changes

        warning: repository is unrelated

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

      merge both repos

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ mkdir src

      move b content

        $ hg mv b src

        $ hg ci -m "import b in src"

        $ hg manifest

        src/b

        tst/a

        $ cd ..

	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

				Issue586: removing remote files after merge appears to corrupt the
				dirstate

				$ hg init a
				$ cd a
				$ echo a > a
				$ hg ci -Ama
				adding a

				$ hg init ../b
				$ cd ../b
				$ echo b > b
				$ hg ci -Amb
				adding b

				$ hg pull -f ../a
				pulling from ../a
				searching for changes
				warning: repository is unrelated
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				(run 'hg heads' to see heads, 'hg merge' to merge)
				$ hg merge
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg rm -f a
				$ hg ci -Amc

				$ hg st -A
				C b
				$ cd ..

				Issue1433: Traceback after two unrelated pull, two move, a merge and
				a commit (related to issue586)

				create test repos

				$ hg init repoa
				$ touch repoa/a
				$ hg -R repoa ci -Am adda
				adding a

				$ hg init repob
				$ touch repob/b
				$ hg -R repob ci -Am addb
				adding b

				$ hg init repoc
				$ cd repoc
				$ hg pull ../repoa
				pulling from ../repoa
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)
				$ hg update
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ mkdir tst
				$ hg mv * tst
				$ hg ci -m "import a in tst"
				$ hg pull -f ../repob
				pulling from ../repob
				searching for changes
				warning: repository is unrelated
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				(run 'hg heads' to see heads, 'hg merge' to merge)

				merge both repos

				$ hg merge
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ mkdir src

				move b content

				$ hg mv b src
				$ hg ci -m "import b in src"
				$ hg manifest
				src/b
				tst/a

				$ cd ..