upstream/mercurial-mirror Files · tests/test-rebase-issue-noparam-single-rev.t

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Durham Goode - - Load All Authors

File last commit:

r23835:aa4a1672 default


                r32255:7e35d31b

default

Download file

             test-rebase-issue-noparam-single-rev.t
        
                    130 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-issue-noparam-single-rev.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > 

        > [phases]

        > publish=False

        > 

        > [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

        $ echo l1 > l1

        $ hg ci -Am l1

        adding l1

        $ hg up -q -C 1

        $ echo r1 > r1

        $ hg ci -Am r1

        adding r1

        created new head

        $ echo r2 > r2

        $ hg ci -Am r2

        adding r2

        $ hg tglog

        @  4: 'r2'

        |

        o  3: 'r1'

        |

        | o  2: 'l1'

        |/

        o  1: 'c2'

        |

        o  0: 'c1'

      Rebase with no arguments - single revision in source branch:

        $ hg up -q -C 2

        $ hg rebase

        rebasing 2:87c180a611f2 "l1"

        saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-backup.hg (glob)

        $ hg tglog

        @  4: 'l1'

        |

        o  3: 'r2'

        |

        o  2: 'r1'

        |

        o  1: 'c2'

        |

        o  0: 'c1'

        $ cd ..

        $ hg init b

        $ cd b

        $ echo c1 > c1

        $ hg ci -Am c1

        adding c1

        $ echo c2 > c2

        $ hg ci -Am c2

        adding c2

        $ echo l1 > l1

        $ hg ci -Am l1

        adding l1

        $ echo l2 > l2

        $ hg ci -Am l2

        adding l2

        $ hg up -q -C 1

        $ echo r1 > r1

        $ hg ci -Am r1

        adding r1

        created new head

        $ hg tglog

        @  4: 'r1'

        |

        | o  3: 'l2'

        | |

        | o  2: 'l1'

        |/

        o  1: 'c2'

        |

        o  0: 'c1'

      Rebase with no arguments - single revision in target branch:

        $ hg up -q -C 3

        $ hg rebase

        rebasing 2:87c180a611f2 "l1"

        rebasing 3:1ac923b736ef "l2"

        saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-backup.hg (glob)

        $ hg tglog

        @  4: 'l2'

        |

        o  3: 'l1'

        |

        o  2: 'r1'

        |

        o  1: 'c2'

        |

        o  0: 'c1'

        $ 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 >> $HGRCPATH <<EOF
				> [extensions]
				> rebase=
				>
				> [phases]
				> publish=False
				>
				> [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

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

				$ hg up -q -C 1

				$ echo r1 > r1
				$ hg ci -Am r1
				adding r1
				created new head

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

				$ hg tglog
				@ 4: 'r2'
				\|
				o 3: 'r1'
				\|
				\| o 2: 'l1'
				\|/
				o 1: 'c2'
				\|
				o 0: 'c1'

				Rebase with no arguments - single revision in source branch:

				$ hg up -q -C 2

				$ hg rebase
				rebasing 2:87c180a611f2 "l1"
				saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-backup.hg (glob)

				$ hg tglog
				@ 4: 'l1'
				\|
				o 3: 'r2'
				\|
				o 2: 'r1'
				\|
				o 1: 'c2'
				\|
				o 0: 'c1'

				$ cd ..


				$ hg init b
				$ cd b

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

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

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

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

				$ hg up -q -C 1

				$ echo r1 > r1
				$ hg ci -Am r1
				adding r1
				created new head

				$ hg tglog
				@ 4: 'r1'
				\|
				\| o 3: 'l2'
				\| \|
				\| o 2: 'l1'
				\|/
				o 1: 'c2'
				\|
				o 0: 'c1'

				Rebase with no arguments - single revision in target branch:

				$ hg up -q -C 3

				$ hg rebase
				rebasing 2:87c180a611f2 "l1"
				rebasing 3:1ac923b736ef "l2"
				saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-backup.hg (glob)

				$ hg tglog
				@ 4: 'l2'
				\|
				o 3: 'l1'
				\|
				o 2: 'r1'
				\|
				o 1: 'c2'
				\|
				o 0: 'c1'


				$ cd ..