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

Siddharth Agarwal - - Load All Authors

File last commit:

r19798:76df01e5 default


                r24996:58308dde

default

Download file

             test-issue1502.t
        
                    42 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1502.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        David Soria Parra
    
bookmarks: restrict moving a bookmark to its descendants (issue1502)...

              r13478
            
      http://mercurial.selenic.com/bts/issue1502

      Initialize repository

        $ hg init foo

        $ touch foo/a && hg -R foo commit -A -m "added a"

        adding a

        $ hg clone foo foo1

        updating to branch default

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

        $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"

        $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"

        $ hg -R foo1 pull -u

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        pulling from $TESTTMP/foo (glob)

        David Soria Parra
    
bookmarks: restrict moving a bookmark to its descendants (issue1502)...

              r13478
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        Siddharth Agarwal
    
update: improve error message for clean non-linear update

              r19798
            
        not updating: not a linear update

        (merge or update --check to force update)

        David Soria Parra
    
bookmarks: restrict moving a bookmark to its descendants (issue1502)...

              r13478
            
        $ hg -R foo1 book branchy

        $ hg -R foo1 book

         * branchy                   1:e3e522925eff

      Pull. Bookmark should not jump to new head.

        $ echo "there" >> foo/a && hg -R foo commit -m "edited a again"

        $ hg -R foo1 pull

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        pulling from $TESTTMP/foo (glob)

        David Soria Parra
    
bookmarks: restrict moving a bookmark to its descendants (issue1502)...

              r13478
            
        searching for 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 -R foo1 book

         * branchy                   1:e3e522925eff

	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

David Soria Parra bookmarks: restrict moving a bookmark to its descendants (issue1502)...	r13478	http://mercurial.selenic.com/bts/issue1502

		Initialize repository

		$ hg init foo
		$ touch foo/a && hg -R foo commit -A -m "added a"
		adding a

		$ hg clone foo foo1
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"
		$ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"
		$ hg -R foo1 pull -u
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	pulling from $TESTTMP/foo (glob)
David Soria Parra bookmarks: restrict moving a bookmark to its descendants (issue1502)...	r13478	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
Siddharth Agarwal update: improve error message for clean non-linear update	r19798	not updating: not a linear update
		(merge or update --check to force update)
David Soria Parra bookmarks: restrict moving a bookmark to its descendants (issue1502)...	r13478
		$ hg -R foo1 book branchy
		$ hg -R foo1 book
		* branchy 1:e3e522925eff

		Pull. Bookmark should not jump to new head.

		$ echo "there" >> foo/a && hg -R foo commit -m "edited a again"
		$ hg -R foo1 pull
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	pulling from $TESTTMP/foo (glob)
David Soria Parra bookmarks: restrict moving a bookmark to its descendants (issue1502)...	r13478	searching for 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 -R foo1 book
		* branchy 1:e3e522925eff