upstream/mercurial-mirror Files · tests/test-histedit-merge-tools.t

transaction: issue "new obsmarkers" message at the end of the transaction...

transaction: issue "new obsmarkers" message at the end of the transaction Instead of making bundle2 code responsible for this, it seems better to have it handled and the transaction level. First, it means the message will be more consistently printed. Second it means we won't spam the message over and over if the data arrive in multiple piece. Third, we are planning to move other similar message at the same level (for the same reason) so having them all at the same location will help us to control the order they are displayed.

Rodrigo Damazio Bovendorp - - Load All Authors

File last commit:

r42219:15d2afa3 default


                r43164:38392d5b

default

Download file

             test-histedit-merge-tools.t
        
                    57 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-histedit-merge-tools.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test histedit extension: Merge tools

      ====================================

      Initialization

      ---------------

        $ . "$TESTDIR/histedit-helpers.sh"

        $ cat >> $HGRCPATH <<EOF

        > [alias]

        > logt = log --template '{rev}:{node|short} {desc|firstline}\n'

        > [extensions]

        > histedit=

        > mockmakedate = $TESTDIR/mockmakedate.py

        > [ui]

        > pre-merge-tool-output-template='pre-merge message for {node}\n'

        > EOF

      Merge conflict

      --------------

        $ hg init r

        $ cd r

        $ echo foo > file

        $ hg add file

        $ hg ci -m "First" -d "1 0"

        $ echo bar > file

        $ hg ci -m "Second" -d "2 0"

        $ hg logt --graph

        @  1:2aa920f62fb9 Second

        |

        o  0:7181f42b8fca First

      Invert the order of the commits, but fail the merge.

        $ hg histedit --config ui.merge=false --commands - 2>&1 <<EOF | fixbundle

        > pick 2aa920f62fb9 Second

        > pick 7181f42b8fca First

        > EOF

        merging file

        pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec

        merging file failed!

        Fix up the change (pick 7181f42b8fca)

        (hg histedit --continue to resume)

        $ hg histedit --abort | fixbundle

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

      Invert the order of the commits, and pretend the merge succeeded.

        $ hg histedit --config ui.merge=true --commands - 2>&1 <<EOF | fixbundle

        > pick 2aa920f62fb9 Second

        > pick 7181f42b8fca First

        > EOF

        merging file

        pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec

        7181f42b8fca: skipping changeset (no changes)

	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

				Test histedit extension: Merge tools
				====================================

				Initialization
				---------------

				$ . "$TESTDIR/histedit-helpers.sh"

				$ cat >> $HGRCPATH <<EOF
				> [alias]
				> logt = log --template '{rev}:{node\|short} {desc\|firstline}\n'
				> [extensions]
				> histedit=
				> mockmakedate = $TESTDIR/mockmakedate.py
				> [ui]
				> pre-merge-tool-output-template='pre-merge message for {node}\n'
				> EOF

				Merge conflict
				--------------

				$ hg init r
				$ cd r
				$ echo foo > file
				$ hg add file
				$ hg ci -m "First" -d "1 0"
				$ echo bar > file
				$ hg ci -m "Second" -d "2 0"

				$ hg logt --graph
				@ 1:2aa920f62fb9 Second
				\|
				o 0:7181f42b8fca First


				Invert the order of the commits, but fail the merge.
				$ hg histedit --config ui.merge=false --commands - 2>&1 <<EOF \| fixbundle
				> pick 2aa920f62fb9 Second
				> pick 7181f42b8fca First
				> EOF
				merging file
				pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec
				merging file failed!
				Fix up the change (pick 7181f42b8fca)
				(hg histedit --continue to resume)

				$ hg histedit --abort \| fixbundle
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Invert the order of the commits, and pretend the merge succeeded.
				$ hg histedit --config ui.merge=true --commands - 2>&1 <<EOF \| fixbundle
				> pick 2aa920f62fb9 Second
				> pick 7181f42b8fca First
				> EOF
				merging file
				pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec
				7181f42b8fca: skipping changeset (no changes)