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

Pierre-Yves David - - Load All Authors

File last commit:

r21947:b081decd stable


                r22285:85bded43

default

Download file

             test-rebase-mq-skip.t
        
                    139 lines
            
             | 2.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-mq-skip.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      This emulates the effects of an hg pull --rebase in which the remote repo

      already has one local mq patch

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > mq=

        > 

        > [phases]

        > publish=False

        > 

        > [alias]

        > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n"

        > EOF

        $ hg init a

        $ cd a

        $ hg qinit -c

        $ echo c1 > c1

        $ hg add c1

        $ hg ci -m C1

        $ echo r1 > r1

        $ hg add r1

        $ hg ci -m R1

        $ hg up -q 0

        $ hg qnew p0.patch

        $ echo p0 > p0

        $ hg add p0

        $ hg qref -m P0

        $ hg qnew p1.patch

        $ echo p1 > p1

        $ hg add p1

        $ hg qref -m P1

        $ hg export qtip > p1.patch

        $ hg up -q -C 1

        $ hg import p1.patch

        applying p1.patch

        $ rm p1.patch

        $ hg up -q -C qtip

        $ hg rebase

        saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

        $ hg tglog

        @  3: 'P0' tags: p0.patch qbase qtip tip

        |

        o  2: 'P1' tags: qparent

        |

        o  1: 'R1' tags:

        |

        o  0: 'C1' tags:

        $ cd ..

        $ hg init b

        $ cd b

        $ hg qinit -c

        $ for i in r0 r1 r2 r3 r4 r5 r6;

        > do

        >     echo $i > $i

        >     hg ci -Am $i

        > done

        adding r0

        adding r1

        adding r2

        adding r3

        adding r4

        adding r5

        adding r6

        $ hg qimport -r 1:tip

        $ hg up -q 0

        $ for i in r1 r3 r7 r8;

        > do

        >     echo $i > $i

        >     hg ci -Am branch2-$i

        > done

        adding r1

        created new head

        adding r3

        adding r7

        adding r8

        $ echo somethingelse > r4

        $ hg ci -Am branch2-r4

        adding r4

        $ echo r6 > r6

        $ hg ci -Am branch2-r6

        adding r6

        $ hg up -q qtip

        $ HGMERGE=internal:fail hg rebase

        unresolved conflicts (see hg resolve, then hg rebase --continue)

        [1]

        $ HGMERGE=internal:local hg resolve --all

        (no more unresolved files)

        $ hg rebase --continue

        saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)

        $ hg tglog

        @  8: 'r5' tags: 5.diff qtip tip

        |

        o  7: 'r2' tags: 2.diff qbase

        |

        o  6: 'branch2-r6' tags: qparent

        |

        o  5: 'branch2-r4' tags:

        |

        o  4: 'branch2-r8' tags:

        |

        o  3: 'branch2-r7' tags:

        |

        o  2: 'branch2-r3' tags:

        |

        o  1: 'branch2-r1' tags:

        |

        o  0: 'r0' tags:

        $ 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

				This emulates the effects of an hg pull --rebase in which the remote repo
				already has one local mq patch

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> rebase=
				> mq=
				>
				> [phases]
				> publish=False
				>
				> [alias]
				> tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n"
				> EOF


				$ hg init a
				$ cd a
				$ hg qinit -c

				$ echo c1 > c1
				$ hg add c1
				$ hg ci -m C1

				$ echo r1 > r1
				$ hg add r1
				$ hg ci -m R1

				$ hg up -q 0

				$ hg qnew p0.patch
				$ echo p0 > p0
				$ hg add p0
				$ hg qref -m P0

				$ hg qnew p1.patch
				$ echo p1 > p1
				$ hg add p1
				$ hg qref -m P1

				$ hg export qtip > p1.patch

				$ hg up -q -C 1

				$ hg import p1.patch
				applying p1.patch

				$ rm p1.patch

				$ hg up -q -C qtip

				$ hg rebase
				saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 3: 'P0' tags: p0.patch qbase qtip tip
				\|
				o 2: 'P1' tags: qparent
				\|
				o 1: 'R1' tags:
				\|
				o 0: 'C1' tags:

				$ cd ..


				$ hg init b
				$ cd b
				$ hg qinit -c

				$ for i in r0 r1 r2 r3 r4 r5 r6;
				> do
				> echo $i > $i
				> hg ci -Am $i
				> done
				adding r0
				adding r1
				adding r2
				adding r3
				adding r4
				adding r5
				adding r6

				$ hg qimport -r 1:tip

				$ hg up -q 0

				$ for i in r1 r3 r7 r8;
				> do
				> echo $i > $i
				> hg ci -Am branch2-$i
				> done
				adding r1
				created new head
				adding r3
				adding r7
				adding r8

				$ echo somethingelse > r4
				$ hg ci -Am branch2-r4
				adding r4

				$ echo r6 > r6
				$ hg ci -Am branch2-r6
				adding r6

				$ hg up -q qtip

				$ HGMERGE=internal:fail hg rebase
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				$ HGMERGE=internal:local hg resolve --all
				(no more unresolved files)

				$ hg rebase --continue
				saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 8: 'r5' tags: 5.diff qtip tip
				\|
				o 7: 'r2' tags: 2.diff qbase
				\|
				o 6: 'branch2-r6' tags: qparent
				\|
				o 5: 'branch2-r4' tags:
				\|
				o 4: 'branch2-r8' tags:
				\|
				o 3: 'branch2-r7' tags:
				\|
				o 2: 'branch2-r3' tags:
				\|
				o 1: 'branch2-r1' tags:
				\|
				o 0: 'r0' tags:


				$ cd ..