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

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22284:72b37865

default

Download file

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

        Martin Geisler
    
tests: added a short description to issue numbers...

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

      dirstate

        Martin Geisler
    
tests: unify test-586

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

        Peter Arrenbrecht
    
discovery: avoid discovery when local graph is a subset of remote...

              r13742
            
        requesting all changes

        Martin Geisler
    
tests: unify test-586

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

        Martin Geisler
    
tests: added a short description to issue numbers...

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

      a commit (related to issue586)

        Martin Geisler
    
tests: unify test-586

              r11846
            
      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

        Peter Arrenbrecht
    
discovery: avoid discovery when local graph is a subset of remote...

              r13742
            
        requesting all changes

        Martin Geisler
    
tests: unify test-586

              r11846
            
        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

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

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

Martin Geisler tests: added a short description to issue numbers...	r12399	Issue586: removing remote files after merge appears to corrupt the
		dirstate
Martin Geisler tests: unify test-586	r11846
		$ 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
Peter Arrenbrecht discovery: avoid discovery when local graph is a subset of remote...	r13742	requesting all changes
Martin Geisler tests: unify test-586	r11846	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 ..

Martin Geisler tests: added a short description to issue numbers...	r12399	Issue1433: Traceback after two unrelated pull, two move, a merge and
		a commit (related to issue586)
Martin Geisler tests: unify test-586	r11846
		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
Peter Arrenbrecht discovery: avoid discovery when local graph is a subset of remote...	r13742	requesting all changes
Martin Geisler tests: unify test-586	r11846	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

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..