upstream/mercurial-mirror Files · tests/test-patch-offset.t

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22285:85bded43

default

Download file

             test-patch-offset.t
        
                    79 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-patch-offset.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat > writepatterns.py <<EOF

        > import sys

        > 

        > path = sys.argv[1]

        > patterns = sys.argv[2:]

        > 

        > fp = file(path, 'wb')

        > for pattern in patterns:

        >     count = int(pattern[0:-1])

        >     char = pattern[-1] + '\n'

        >     fp.write(char*count)

        > fp.close()

        > EOF

      prepare repo

        $ hg init a

        $ cd a

      These initial lines of Xs were not in the original file used to generate

      the patch.  So all the patch hunks need to be applied to a constant offset

      within this file.  If the offset isn't tracked then the hunks can be

      applied to the wrong lines of this file.

        $ python ../writepatterns.py a 34X 10A 1B 10A 1C 10A 1B 10A 1D 10A 1B 10A 1E 10A 1B 10A

        $ hg commit -Am adda

        adding a

      This is a cleaner patch generated via diff

      In this case it reproduces the problem when

      the output of hg export does not

      import patch

        $ hg import -v -m 'b' -d '2 0' - <<EOF

        > --- a/a	2009-12-08 19:26:17.000000000 -0800

        > +++ b/a	2009-12-08 19:26:17.000000000 -0800

        > @@ -9,7 +9,7 @@

        >  A

        >  A

        >  B

        > -A

        > +a

        >  A

        >  A

        >  A

        > @@ -53,7 +53,7 @@

        >  A

        >  A

        >  B

        > -A

        > +a

        >  A

        >  A

        >  A

        > @@ -75,7 +75,7 @@

        >  A

        >  A

        >  B

        > -A

        > +a

        >  A

        >  A

        >  A

        > EOF

        applying patch from stdin

        patching file a

        Hunk #1 succeeded at 43 (offset 34 lines).

        Hunk #2 succeeded at 87 (offset 34 lines).

        Hunk #3 succeeded at 109 (offset 34 lines).

        a

        created 189885cecb41

      compare imported changes against reference file

        $ python ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A

        $ diff aref 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


				$ cat > writepatterns.py <<EOF
				> import sys
				>
				> path = sys.argv[1]
				> patterns = sys.argv[2:]
				>
				> fp = file(path, 'wb')
				> for pattern in patterns:
				> count = int(pattern[0:-1])
				> char = pattern[-1] + '\n'
				> fp.write(char*count)
				> fp.close()
				> EOF

				prepare repo

				$ hg init a
				$ cd a

				These initial lines of Xs were not in the original file used to generate
				the patch. So all the patch hunks need to be applied to a constant offset
				within this file. If the offset isn't tracked then the hunks can be
				applied to the wrong lines of this file.

				$ python ../writepatterns.py a 34X 10A 1B 10A 1C 10A 1B 10A 1D 10A 1B 10A 1E 10A 1B 10A
				$ hg commit -Am adda
				adding a

				This is a cleaner patch generated via diff
				In this case it reproduces the problem when
				the output of hg export does not
				import patch

				$ hg import -v -m 'b' -d '2 0' - <<EOF
				> --- a/a 2009-12-08 19:26:17.000000000 -0800
				> +++ b/a 2009-12-08 19:26:17.000000000 -0800
				> @@ -9,7 +9,7 @@
				> A
				> A
				> B
				> -A
				> +a
				> A
				> A
				> A
				> @@ -53,7 +53,7 @@
				> A
				> A
				> B
				> -A
				> +a
				> A
				> A
				> A
				> @@ -75,7 +75,7 @@
				> A
				> A
				> B
				> -A
				> +a
				> A
				> A
				> A
				> EOF
				applying patch from stdin
				patching file a
				Hunk #1 succeeded at 43 (offset 34 lines).
				Hunk #2 succeeded at 87 (offset 34 lines).
				Hunk #3 succeeded at 109 (offset 34 lines).
				a
				created 189885cecb41

				compare imported changes against reference file

				$ python ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A
				$ diff aref a

				$ cd ..