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

Siddharth Agarwal - - Load All Authors

File last commit:

r19798:76df01e5 default


                r22284:72b37865

default

Download file

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

      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

        pulling from $TESTTMP/foo (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        not updating: not a linear update

        (merge or update --check to force update)

        $ 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

        pulling from $TESTTMP/foo (glob)

        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

				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
				pulling from $TESTTMP/foo (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				not updating: not a linear update
				(merge or update --check to force update)

				$ 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
				pulling from $TESTTMP/foo (glob)
				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