upstream/mercurial-mirror Files · tests/test-unrelated-pull.t

mq: use dirstateguard instead of dirstate.invalidate (qpush)...

mq: use dirstateguard instead of dirstate.invalidate (qpush) Before this patch, "mq.queue.apply()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during afailure. But it just discards changes in memory, and doesn't actually restore ".hg/dirstate". Then, it can't work as expected, if "dirstate.write()" is executed while processing. This patch uses "dirstateguard" instead of "dirstate.invalidate()" to restore ".hg/dirstate" at failure even if "dirstate.write()" is executed before failure. This is a part of preparations to fix the issue that the recent (in memory) dirstate isn't visible to external processes (e.g. "precommit" hook).

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r24996:58308dde

default

Download file

             test-unrelated-pull.t
        
                    45 lines
            
             | 870 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-unrelated-pull.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init a

        $ cd a

        $ echo 123 > a

        $ hg add a

        $ hg commit -m "a" -u a

        $ cd ..

        $ hg init b

        $ cd b

        $ echo 321 > b

        $ hg add b

        $ hg commit -m "b" -u b

        $ hg pull ../a

        pulling from ../a

        searching for changes

        abort: repository is unrelated

        [255]

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

        changeset:   1:9a79c33a9db3

        tag:         tip

        parent:      -1:000000000000

        user:        a

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     a

        changeset:   0:01f8062b2de5

        user:        b

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     b

        $ 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

				$ hg init a
				$ cd a
				$ echo 123 > a
				$ hg add a
				$ hg commit -m "a" -u a

				$ cd ..
				$ hg init b
				$ cd b
				$ echo 321 > b
				$ hg add b
				$ hg commit -m "b" -u b

				$ hg pull ../a
				pulling from ../a
				searching for changes
				abort: repository is unrelated
				[255]

				$ 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 heads
				changeset: 1:9a79c33a9db3
				tag: tip
				parent: -1:000000000000
				user: a
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: a

				changeset: 0:01f8062b2de5
				user: b
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: b


				$ cd ..