upstream/mercurial-mirror Files · tests/test-issue1089.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-issue1089.t
        
                    26 lines
            
             | 321 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1089.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

        $ hg init

        $ mkdir a

        $ echo a > a/b

        $ hg ci -Am m

        adding a/b

        $ hg rm a

        removing a/b (glob)

        $ hg ci -m m a

        $ mkdir a b

        $ echo a > a/b

        $ hg ci -Am m

        adding a/b

        $ hg rm a

        removing a/b (glob)

        $ cd b

      Relative delete:

        $ hg ci -m m ../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

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

				$ hg init
				$ mkdir a
				$ echo a > a/b
				$ hg ci -Am m
				adding a/b

				$ hg rm a
				removing a/b (glob)
				$ hg ci -m m a

				$ mkdir a b
				$ echo a > a/b
				$ hg ci -Am m
				adding a/b

				$ hg rm a
				removing a/b (glob)
				$ cd b

				Relative delete:

				$ hg ci -m m ../a

				$ cd ..