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

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Mads Kiilerich - - Load All Authors

File last commit:

r23519:8872d1bf default


                r23524:a1a7c94d

default

Download file

             test-rebase-conflicts.t
        
                    322 lines
            
             | 8.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-conflicts.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > 

        > [phases]

        > publish=False

        > 

        > [alias]

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

        > EOF

        $ hg init a

        $ cd a

        $ echo c1 >common

        $ hg add common

        $ hg ci -m C1

        $ echo c2 >>common

        $ hg ci -m C2

        $ echo c3 >>common

        $ hg ci -m C3

        $ hg up -q -C 1

        $ echo l1 >>extra

        $ hg add extra

        $ hg ci -m L1

        created new head

        $ sed -e 's/c2/l2/' common > common.new

        $ mv common.new common

        $ hg ci -m L2

        $ echo l3 >> extra2

        $ hg add extra2

        $ hg ci -m L3

        $ hg bookmark mybook

        $ hg phase --force --secret 4

        $ hg tglog

        @  5:secret 'L3'  mybook

        |

        o  4:secret 'L2'

        |

        o  3:draft 'L1'

        |

        | o  2:draft 'C3'

        |/

        o  1:draft 'C2'

        |

        o  0:draft 'C1'

      Try to call --continue:

        $ hg rebase --continue

        abort: no rebase in progress

        [255]

      Conflicting rebase:

        $ hg rebase -s 3 -d 2

        rebasing 3:3163e20567cc "L1"

        rebasing 4:46f0b057b5c0 "L2"

        merging common

        warning: conflicts during merge.

        merging common incomplete! (edit conflicts, then use 'hg resolve --mark')

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

        [1]

      Try to continue without solving the conflict:

        $ hg rebase --continue

        already rebased 3:3163e20567cc "L1" as 3e046f2ecedb

        rebasing 4:46f0b057b5c0 "L2"

        abort: unresolved merge conflicts (see hg help resolve)

        [255]

      Conclude rebase:

        $ echo 'resolved merge' >common

        $ hg resolve -m common

        (no more unresolved files)

        $ hg rebase --continue

        already rebased 3:3163e20567cc "L1" as 3e046f2ecedb

        rebasing 4:46f0b057b5c0 "L2"

        rebasing 5:8029388f38dc "L3" (mybook)

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

        $ hg tglog

        @  5:secret 'L3'  mybook

        |

        o  4:secret 'L2'

        |

        o  3:draft 'L1'

        |

        o  2:draft 'C3'

        |

        o  1:draft 'C2'

        |

        o  0:draft 'C1'

      Check correctness:

        $ hg cat -r 0 common

        c1

        $ hg cat -r 1 common

        c1

        c2

        $ hg cat -r 2 common

        c1

        c2

        c3

        $ hg cat -r 3 common

        c1

        c2

        c3

        $ hg cat -r 4 common

        resolved merge

        $ hg cat -r 5 common

        resolved merge

      Bookmark stays active after --continue

        $ hg bookmarks

         * mybook                    5:d67b21408fc0

        $ cd ..

      Check that the right ancestors is used while rebasing a merge (issue4041)

        $ hg clone "$TESTDIR/bundles/issue4041.hg" issue4041

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 11 changesets with 8 changes to 3 files (+1 heads)

        updating to branch default

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

        $ cd issue4041

        $ hg phase --draft --force 9

        $ hg log -G

        o    changeset:   10:2f2496ddf49d

        |\   branch:      f1

        | |  tag:         tip

        | |  parent:      7:4c9fbe56a16f

        | |  parent:      9:e31216eec445

        | |  user:        szhang

        | |  date:        Thu Sep 05 12:59:39 2013 -0400

        | |  summary:     merge

        | |

        | o  changeset:   9:e31216eec445

        | |  branch:      f1

        | |  user:        szhang

        | |  date:        Thu Sep 05 12:59:10 2013 -0400

        | |  summary:     more changes to f1

        | |

        | o    changeset:   8:8e4e2c1a07ae

        | |\   branch:      f1

        | | |  parent:      2:4bc80088dc6b

        | | |  parent:      6:400110238667

        | | |  user:        szhang

        | | |  date:        Thu Sep 05 12:57:59 2013 -0400

        | | |  summary:     bad merge

        | | |

        o | |  changeset:   7:4c9fbe56a16f

        |/ /   branch:      f1

        | |    parent:      2:4bc80088dc6b

        | |    user:        szhang

        | |    date:        Thu Sep 05 12:54:00 2013 -0400

        | |    summary:     changed f1

        | |

        | o  changeset:   6:400110238667

        | |  branch:      f2

        | |  parent:      4:12e8ec6bb010

        | |  user:        szhang

        | |  date:        Tue Sep 03 13:58:02 2013 -0400

        | |  summary:     changed f2 on f2

        | |

        | | @  changeset:   5:d79e2059b5c0

        | | |  parent:      3:8a951942e016

        | | |  user:        szhang

        | | |  date:        Tue Sep 03 13:57:39 2013 -0400

        | | |  summary:     changed f2 on default

        | | |

        | o |  changeset:   4:12e8ec6bb010

        | |/   branch:      f2

        | |    user:        szhang

        | |    date:        Tue Sep 03 13:57:18 2013 -0400

        | |    summary:     created f2 branch

        | |

        | o  changeset:   3:8a951942e016

        | |  parent:      0:24797d4f68de

        | |  user:        szhang

        | |  date:        Tue Sep 03 13:57:11 2013 -0400

        | |  summary:     added f2.txt

        | |

        o |  changeset:   2:4bc80088dc6b

        | |  branch:      f1

        | |  user:        szhang

        | |  date:        Tue Sep 03 13:56:20 2013 -0400

        | |  summary:     added f1.txt

        | |

        o |  changeset:   1:ef53c9e6b608

        |/   branch:      f1

        |    user:        szhang

        |    date:        Tue Sep 03 13:55:26 2013 -0400

        |    summary:     created f1 branch

        |

        o  changeset:   0:24797d4f68de

           user:        szhang

           date:        Tue Sep 03 13:55:08 2013 -0400

           summary:     added default.txt

        $ hg rebase -s9 -d2 --debug # use debug to really check merge base used

        rebase onto 2 starting from e31216eec445

        ignoring null merge rebase of 3

        ignoring null merge rebase of 4

        ignoring null merge rebase of 6

        ignoring null merge rebase of 8

        rebasing 9:e31216eec445 "more changes to f1"

        rebasing: 9:e31216eec445 5/6 changesets (83.33%)

         future parents are 2 and -1

        rebase status stored

         update to 2:4bc80088dc6b

        resolving manifests

         branchmerge: False, force: True, partial: False

         ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b

         f2.txt: other deleted -> r

        removing f2.txt

        updating: f2.txt 1/2 files (50.00%)

         f1.txt: remote created -> g

        getting f1.txt

        updating: f1.txt 2/2 files (100.00%)

         merge against 9:e31216eec445

           detach base 8:8e4e2c1a07ae

          searching for copies back to rev 3

        resolving manifests

         branchmerge: True, force: True, partial: False

         ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445

         f1.txt: remote is newer -> g

        getting f1.txt

        updating: f1.txt 1/1 files (100.00%)

        f1.txt

        rebased as 19c888675e13

        rebasing 10:2f2496ddf49d "merge" (tip)

        rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%)

         future parents are 11 and 7

        rebase status stored

         already in target

         merge against 10:2f2496ddf49d

           detach base 9:e31216eec445

          searching for copies back to rev 3

        resolving manifests

         branchmerge: True, force: True, partial: False

         ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d

         f1.txt: remote is newer -> g

        getting f1.txt

        updating: f1.txt 1/1 files (100.00%)

        f1.txt

        rebased as 2a7f09cac94c

        rebase merging completed

        update back to initial working directory parent

        resolving manifests

         branchmerge: False, force: False, partial: False

         ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0

         f1.txt: other deleted -> r

        removing f1.txt

        updating: f1.txt 1/2 files (50.00%)

         f2.txt: remote created -> g

        getting f2.txt

        updating: f2.txt 2/2 files (100.00%)

        3 changesets found

        list of changesets:

        4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c

        e31216eec445e44352c5f01588856059466a24c9

        2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2

        bundling: 1/3 changesets (33.33%)

        bundling: 2/3 changesets (66.67%)

        bundling: 3/3 changesets (100.00%)

        bundling: 1/3 manifests (33.33%)

        bundling: 2/3 manifests (66.67%)

        bundling: 3/3 manifests (100.00%)

        bundling: f1.txt 1/1 files (100.00%)

        saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-backup.hg (glob)

        3 changesets found

        list of changesets:

        4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c

        19c888675e133ab5dff84516926a65672eaf04d9

        2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf

        bundling: 1/3 changesets (33.33%)

        bundling: 2/3 changesets (66.67%)

        bundling: 3/3 changesets (100.00%)

        bundling: 1/3 manifests (33.33%)

        bundling: 2/3 manifests (66.67%)

        bundling: 3/3 manifests (100.00%)

        bundling: f1.txt 1/1 files (100.00%)

        adding branch

        adding changesets

        changesets: 1 chunks

        add changeset 4c9fbe56a16f

        changesets: 2 chunks

        add changeset 19c888675e13

        changesets: 3 chunks

        add changeset 2a7f09cac94c

        adding manifests

        manifests: 1/2 chunks (50.00%)

        manifests: 2/2 chunks (100.00%)

        manifests: 3/2 chunks (150.00%)

        adding file changes

        adding f1.txt revisions

        files: 1/1 chunks (100.00%)

        added 2 changesets with 2 changes to 1 files

        removing unknown node e31216eec445 from 1-phase boundary

        invalid branchheads cache (served): tip differs

        rebase completed

        updating the branch cache

	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}:{phase} '{desc}' {branches} {bookmarks}\n"
				> EOF

				$ hg init a
				$ cd a
				$ echo c1 >common
				$ hg add common
				$ hg ci -m C1

				$ echo c2 >>common
				$ hg ci -m C2

				$ echo c3 >>common
				$ hg ci -m C3

				$ hg up -q -C 1

				$ echo l1 >>extra
				$ hg add extra
				$ hg ci -m L1
				created new head

				$ sed -e 's/c2/l2/' common > common.new
				$ mv common.new common
				$ hg ci -m L2

				$ echo l3 >> extra2
				$ hg add extra2
				$ hg ci -m L3
				$ hg bookmark mybook

				$ hg phase --force --secret 4

				$ hg tglog
				@ 5:secret 'L3' mybook
				\|
				o 4:secret 'L2'
				\|
				o 3:draft 'L1'
				\|
				\| o 2:draft 'C3'
				\|/
				o 1:draft 'C2'
				\|
				o 0:draft 'C1'

				Try to call --continue:

				$ hg rebase --continue
				abort: no rebase in progress
				[255]

				Conflicting rebase:

				$ hg rebase -s 3 -d 2
				rebasing 3:3163e20567cc "L1"
				rebasing 4:46f0b057b5c0 "L2"
				merging common
				warning: conflicts during merge.
				merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				Try to continue without solving the conflict:

				$ hg rebase --continue
				already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
				rebasing 4:46f0b057b5c0 "L2"
				abort: unresolved merge conflicts (see hg help resolve)
				[255]

				Conclude rebase:

				$ echo 'resolved merge' >common
				$ hg resolve -m common
				(no more unresolved files)
				$ hg rebase --continue
				already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
				rebasing 4:46f0b057b5c0 "L2"
				rebasing 5:8029388f38dc "L3" (mybook)
				saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-backup.hg (glob)

				$ hg tglog
				@ 5:secret 'L3' mybook
				\|
				o 4:secret 'L2'
				\|
				o 3:draft 'L1'
				\|
				o 2:draft 'C3'
				\|
				o 1:draft 'C2'
				\|
				o 0:draft 'C1'

				Check correctness:

				$ hg cat -r 0 common
				c1

				$ hg cat -r 1 common
				c1
				c2

				$ hg cat -r 2 common
				c1
				c2
				c3

				$ hg cat -r 3 common
				c1
				c2
				c3

				$ hg cat -r 4 common
				resolved merge

				$ hg cat -r 5 common
				resolved merge

				Bookmark stays active after --continue
				$ hg bookmarks
				* mybook 5:d67b21408fc0

				$ cd ..

				Check that the right ancestors is used while rebasing a merge (issue4041)

				$ hg clone "$TESTDIR/bundles/issue4041.hg" issue4041
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 11 changesets with 8 changes to 3 files (+1 heads)
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd issue4041
				$ hg phase --draft --force 9
				$ hg log -G
				o changeset: 10:2f2496ddf49d
				\|\ branch: f1
				\| \| tag: tip
				\| \| parent: 7:4c9fbe56a16f
				\| \| parent: 9:e31216eec445
				\| \| user: szhang
				\| \| date: Thu Sep 05 12:59:39 2013 -0400
				\| \| summary: merge
				\| \|
				\| o changeset: 9:e31216eec445
				\| \| branch: f1
				\| \| user: szhang
				\| \| date: Thu Sep 05 12:59:10 2013 -0400
				\| \| summary: more changes to f1
				\| \|
				\| o changeset: 8:8e4e2c1a07ae
				\| \|\ branch: f1
				\| \| \| parent: 2:4bc80088dc6b
				\| \| \| parent: 6:400110238667
				\| \| \| user: szhang
				\| \| \| date: Thu Sep 05 12:57:59 2013 -0400
				\| \| \| summary: bad merge
				\| \| \|
				o \| \| changeset: 7:4c9fbe56a16f
				\|/ / branch: f1
				\| \| parent: 2:4bc80088dc6b
				\| \| user: szhang
				\| \| date: Thu Sep 05 12:54:00 2013 -0400
				\| \| summary: changed f1
				\| \|
				\| o changeset: 6:400110238667
				\| \| branch: f2
				\| \| parent: 4:12e8ec6bb010
				\| \| user: szhang
				\| \| date: Tue Sep 03 13:58:02 2013 -0400
				\| \| summary: changed f2 on f2
				\| \|
				\| \| @ changeset: 5:d79e2059b5c0
				\| \| \| parent: 3:8a951942e016
				\| \| \| user: szhang
				\| \| \| date: Tue Sep 03 13:57:39 2013 -0400
				\| \| \| summary: changed f2 on default
				\| \| \|
				\| o \| changeset: 4:12e8ec6bb010
				\| \|/ branch: f2
				\| \| user: szhang
				\| \| date: Tue Sep 03 13:57:18 2013 -0400
				\| \| summary: created f2 branch
				\| \|
				\| o changeset: 3:8a951942e016
				\| \| parent: 0:24797d4f68de
				\| \| user: szhang
				\| \| date: Tue Sep 03 13:57:11 2013 -0400
				\| \| summary: added f2.txt
				\| \|
				o \| changeset: 2:4bc80088dc6b
				\| \| branch: f1
				\| \| user: szhang
				\| \| date: Tue Sep 03 13:56:20 2013 -0400
				\| \| summary: added f1.txt
				\| \|
				o \| changeset: 1:ef53c9e6b608
				\|/ branch: f1
				\| user: szhang
				\| date: Tue Sep 03 13:55:26 2013 -0400
				\| summary: created f1 branch
				\|
				o changeset: 0:24797d4f68de
				user: szhang
				date: Tue Sep 03 13:55:08 2013 -0400
				summary: added default.txt

				$ hg rebase -s9 -d2 --debug # use debug to really check merge base used
				rebase onto 2 starting from e31216eec445
				ignoring null merge rebase of 3
				ignoring null merge rebase of 4
				ignoring null merge rebase of 6
				ignoring null merge rebase of 8
				rebasing 9:e31216eec445 "more changes to f1"
				rebasing: 9:e31216eec445 5/6 changesets (83.33%)
				future parents are 2 and -1
				rebase status stored
				update to 2:4bc80088dc6b
				resolving manifests
				branchmerge: False, force: True, partial: False
				ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b
				f2.txt: other deleted -> r
				removing f2.txt
				updating: f2.txt 1/2 files (50.00%)
				f1.txt: remote created -> g
				getting f1.txt
				updating: f1.txt 2/2 files (100.00%)
				merge against 9:e31216eec445
				detach base 8:8e4e2c1a07ae
				searching for copies back to rev 3
				resolving manifests
				branchmerge: True, force: True, partial: False
				ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445
				f1.txt: remote is newer -> g
				getting f1.txt
				updating: f1.txt 1/1 files (100.00%)
				f1.txt
				rebased as 19c888675e13
				rebasing 10:2f2496ddf49d "merge" (tip)
				rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%)
				future parents are 11 and 7
				rebase status stored
				already in target
				merge against 10:2f2496ddf49d
				detach base 9:e31216eec445
				searching for copies back to rev 3
				resolving manifests
				branchmerge: True, force: True, partial: False
				ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d
				f1.txt: remote is newer -> g
				getting f1.txt
				updating: f1.txt 1/1 files (100.00%)
				f1.txt
				rebased as 2a7f09cac94c
				rebase merging completed
				update back to initial working directory parent
				resolving manifests
				branchmerge: False, force: False, partial: False
				ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0
				f1.txt: other deleted -> r
				removing f1.txt
				updating: f1.txt 1/2 files (50.00%)
				f2.txt: remote created -> g
				getting f2.txt
				updating: f2.txt 2/2 files (100.00%)
				3 changesets found
				list of changesets:
				4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
				e31216eec445e44352c5f01588856059466a24c9
				2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
				bundling: 1/3 changesets (33.33%)
				bundling: 2/3 changesets (66.67%)
				bundling: 3/3 changesets (100.00%)
				bundling: 1/3 manifests (33.33%)
				bundling: 2/3 manifests (66.67%)
				bundling: 3/3 manifests (100.00%)
				bundling: f1.txt 1/1 files (100.00%)
				saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-backup.hg (glob)
				3 changesets found
				list of changesets:
				4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
				19c888675e133ab5dff84516926a65672eaf04d9
				2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf
				bundling: 1/3 changesets (33.33%)
				bundling: 2/3 changesets (66.67%)
				bundling: 3/3 changesets (100.00%)
				bundling: 1/3 manifests (33.33%)
				bundling: 2/3 manifests (66.67%)
				bundling: 3/3 manifests (100.00%)
				bundling: f1.txt 1/1 files (100.00%)
				adding branch
				adding changesets
				changesets: 1 chunks
				add changeset 4c9fbe56a16f
				changesets: 2 chunks
				add changeset 19c888675e13
				changesets: 3 chunks
				add changeset 2a7f09cac94c
				adding manifests
				manifests: 1/2 chunks (50.00%)
				manifests: 2/2 chunks (100.00%)
				manifests: 3/2 chunks (150.00%)
				adding file changes
				adding f1.txt revisions
				files: 1/1 chunks (100.00%)
				added 2 changesets with 2 changes to 1 files
				removing unknown node e31216eec445 from 1-phase boundary
				invalid branchheads cache (served): tip differs
				rebase completed
				updating the branch cache