upstream/mercurial-mirror Files · tests/svn-safe-append.py

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.

Peter Arrenbrecht - - Load All Authors

File last commit:

r6439:c1b47c0f default


                r22284:72b37865

default

Download file

             svn-safe-append.py
        
                    25 lines
            
             | 487 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / svn-safe-append.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env python

      __doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b.

      Without this svn will not detect workspace changes."""

      import sys, os

      text = sys.argv[1]

      fname = sys.argv[2]

      f = open(fname, "ab")

      try:

          before = os.fstat(f.fileno()).st_mtime

          f.write(text)

          f.write("\n")

      finally:

          f.close()

      inc = 1

      now = os.stat(fname).st_mtime

      while now == before:

          t = now + inc

          inc += 1

          os.utime(fname, (t, t))

          now = os.stat(fname).st_mtime

	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

				#!/usr/bin/env python

				__doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b.
				Without this svn will not detect workspace changes."""

				import sys, os

				text = sys.argv[1]
				fname = sys.argv[2]

				f = open(fname, "ab")
				try:
				before = os.fstat(f.fileno()).st_mtime
				f.write(text)
				f.write("\n")
				finally:
				f.close()
				inc = 1
				now = os.stat(fname).st_mtime
				while now == before:
				t = now + inc
				inc += 1
				os.utime(fname, (t, t))
				now = os.stat(fname).st_mtime