upstream/mercurial-mirror Files · tests/test-rebase-brute-force.t

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Boris Feld - - Load All Authors

File last commit:

r34868:7f183c64 default


                r38817:bb54db4a

@96 default

Download file

             test-rebase-brute-force.t
        
                    56 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-brute-force.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > drawdag=$TESTDIR/drawdag.py

        > bruterebase=$TESTDIR/bruterebase.py

        > [experimental]

        > evolution.createmarkers=True

        > evolution.allowunstable=True

        > EOF

        $ init() {

        >   N=`expr ${N:-0} + 1`

        >   cd $TESTTMP && hg init repo$N && cd repo$N

        >   hg debugdrawdag

        > }

      Source looks like "N"

        $ init <<'EOS'

        > C D

        > |\|

        > A B Z

        > EOS

        $ hg debugbruterebase 'all()-Z' Z

           A: A':Z

           B: B':Z

          AB: A':Z B':Z

           C: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents

          AC: A':Z C':A'B

          BC: B':Z C':B'A

         ABC: A':Z B':Z C':A'B'

           D: D':Z

          AD: A':Z D':Z

          BD: B':Z D':B'

         ABD: A':Z B':Z D':B'

          CD: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents

         ACD: A':Z C':A'B D':Z

         BCD: B':Z C':B'A D':B'

        ABCD: A':Z B':Z C':A'B' D':B'

      Moving backwards

        $ init <<'EOS'

        > C

        > |\

        > A B

        > |

        > Z

        > EOS

        $ hg debugbruterebase 'all()-Z' Z

          B: B':Z

          A: 

         BA: B':Z

          C: ABORT: cannot rebase 3:b8d7149b562b without moving at least one of its parents

         BC: B':Z C':B'A

         AC: 

        BAC: B':Z C':B'A

	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]
				> drawdag=$TESTDIR/drawdag.py
				> bruterebase=$TESTDIR/bruterebase.py
				> [experimental]
				> evolution.createmarkers=True
				> evolution.allowunstable=True
				> EOF
				$ init() {
				> N=`expr ${N:-0} + 1`
				> cd $TESTTMP && hg init repo$N && cd repo$N
				> hg debugdrawdag
				> }

				Source looks like "N"

				$ init <<'EOS'
				> C D
				> \|\\|
				> A B Z
				> EOS

				$ hg debugbruterebase 'all()-Z' Z
				A: A':Z
				B: B':Z
				AB: A':Z B':Z
				C: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents
				AC: A':Z C':A'B
				BC: B':Z C':B'A
				ABC: A':Z B':Z C':A'B'
				D: D':Z
				AD: A':Z D':Z
				BD: B':Z D':B'
				ABD: A':Z B':Z D':B'
				CD: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents
				ACD: A':Z C':A'B D':Z
				BCD: B':Z C':B'A D':B'
				ABCD: A':Z B':Z C':A'B' D':B'

				Moving backwards

				$ init <<'EOS'
				> C
				> \|\
				> A B
				> \|
				> Z
				> EOS
				$ hg debugbruterebase 'all()-Z' Z
				B: B':Z
				A:
				BA: B':Z
				C: ABORT: cannot rebase 3:b8d7149b562b without moving at least one of its parents
				BC: B':Z C':B'A
				AC:
				BAC: B':Z C':B'A