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

Mads Kiilerich - - Load All Authors

File last commit:

r20249:dc515784 default


                r22284:72b37865

default

Download file

             test-rebase-pull.t
        
                    167 lines
            
             | 2.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-pull.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > 

        > [alias]

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

        > EOF

        $ hg init a

        $ cd a

        $ echo C1 > C1

        $ hg ci -Am C1

        adding C1

        $ echo C2 > C2

        $ hg ci -Am C2

        adding C2

        $ cd ..

        $ hg clone a b

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg clone a c

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd b

        $ echo L1 > L1

        $ hg ci -Am L1

        adding L1

        $ cd ../a

        $ echo R1 > R1

        $ hg ci -Am R1

        adding R1

        $ cd ../b

      Now b has one revision to be pulled from a:

        $ hg pull --rebase

        pulling from $TESTTMP/a (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

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

        $ hg tglog

        @  3: 'L1'

        |

        o  2: 'R1'

        |

        o  1: 'C2'

        |

        o  0: 'C1'

      Re-run:

        $ hg pull --rebase

        pulling from $TESTTMP/a (glob)

        searching for changes

        no changes found

      Invoke pull --rebase and nothing to rebase:

        $ cd ../c

        $ hg book norebase

        $ hg pull --rebase

        pulling from $TESTTMP/a (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        nothing to rebase - working directory parent is already an ancestor of destination 77ae9631bcca

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

        updating bookmark norebase

        $ hg tglog -l 1

        @  2: 'R1'

        |

      pull --rebase --update should ignore --update:

        $ hg pull --rebase --update

        pulling from $TESTTMP/a (glob)

        searching for changes

        no changes found

      pull --rebase doesn't update if nothing has been pulled:

        $ hg up -q 1

        $ hg pull --rebase

        pulling from $TESTTMP/a (glob)

        searching for changes

        no changes found

        $ hg tglog -l 1

        o  2: 'R1'

        |

        $ cd ..

      pull --rebase works when a specific revision is pulled (issue3619)

        $ cd a

        $ hg tglog

        @  2: 'R1'

        |

        o  1: 'C2'

        |

        o  0: 'C1'

        $ echo R2 > R2

        $ hg ci -Am R2

        adding R2

        $ echo R3 > R3

        $ hg ci -Am R3

        adding R3

        $ cd ../c

        $ hg tglog

        o  2: 'R1'

        |

        @  1: 'C2'

        |

        o  0: 'C1'

        $ echo L1 > L1

        $ hg ci -Am L1

        adding L1

        created new head

        $ hg pull --rev tip --rebase

        pulling from $TESTTMP/a (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 2 changes to 2 files

        saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg (glob)

        $ hg tglog

        @  5: 'L1'

        |

        o  4: 'R3'

        |

        o  3: 'R2'

        |

        o  2: 'R1'

        |

        o  1: 'C2'

        |

        o  0: 'C1'

	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 >> $HGRCPATH <<EOF
				> [extensions]
				> rebase=
				>
				> [alias]
				> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
				> EOF


				$ hg init a
				$ cd a

				$ echo C1 > C1
				$ hg ci -Am C1
				adding C1

				$ echo C2 > C2
				$ hg ci -Am C2
				adding C2

				$ cd ..

				$ hg clone a b
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg clone a c
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cd b

				$ echo L1 > L1
				$ hg ci -Am L1
				adding L1


				$ cd ../a

				$ echo R1 > R1
				$ hg ci -Am R1
				adding R1


				$ cd ../b

				Now b has one revision to be pulled from a:

				$ hg pull --rebase
				pulling from $TESTTMP/a (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 3: 'L1'
				\|
				o 2: 'R1'
				\|
				o 1: 'C2'
				\|
				o 0: 'C1'

				Re-run:

				$ hg pull --rebase
				pulling from $TESTTMP/a (glob)
				searching for changes
				no changes found


				Invoke pull --rebase and nothing to rebase:

				$ cd ../c

				$ hg book norebase
				$ hg pull --rebase
				pulling from $TESTTMP/a (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				nothing to rebase - working directory parent is already an ancestor of destination 77ae9631bcca
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				updating bookmark norebase

				$ hg tglog -l 1
				@ 2: 'R1'
				\|

				pull --rebase --update should ignore --update:

				$ hg pull --rebase --update
				pulling from $TESTTMP/a (glob)
				searching for changes
				no changes found

				pull --rebase doesn't update if nothing has been pulled:

				$ hg up -q 1

				$ hg pull --rebase
				pulling from $TESTTMP/a (glob)
				searching for changes
				no changes found

				$ hg tglog -l 1
				o 2: 'R1'
				\|

				$ cd ..

				pull --rebase works when a specific revision is pulled (issue3619)

				$ cd a
				$ hg tglog
				@ 2: 'R1'
				\|
				o 1: 'C2'
				\|
				o 0: 'C1'

				$ echo R2 > R2
				$ hg ci -Am R2
				adding R2
				$ echo R3 > R3
				$ hg ci -Am R3
				adding R3
				$ cd ../c
				$ hg tglog
				o 2: 'R1'
				\|
				@ 1: 'C2'
				\|
				o 0: 'C1'

				$ echo L1 > L1
				$ hg ci -Am L1
				adding L1
				created new head
				$ hg pull --rev tip --rebase
				pulling from $TESTTMP/a (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 2 changes to 2 files
				saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg (glob)
				$ hg tglog
				@ 5: 'L1'
				\|
				o 4: 'R3'
				\|
				o 3: 'R2'
				\|
				o 2: 'R1'
				\|
				o 1: 'C2'
				\|
				o 0: 'C1'