upstream/mercurial-mirror Files · tests/test-copy-move-merge.t

merge: move dr/rd warning messages out of applyupdates()...

merge: move dr/rd warning messages out of applyupdates() As preparation for making 'dr' and 'rd' actions no longer actions, move the reporting from applyupdates() to its caller update(). This way we won't have to pass additonal arguments to applyupdates() when they are no longer actions. Also, the warnings are equally unrelated to applyupdates() as they are to recordupdates(), as they don't result in any changes to either the working copy or the dirstate. See earlier patch for additional motivation.

Mads Kiilerich - - Load All Authors

File last commit:

r21391:cb158354 default


                r23525:5126d771

default

Download file

             test-copy-move-merge.t
        
                    64 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-copy-move-merge.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init t

        $ cd t

        $ echo 1 > a

        $ hg ci -qAm "first"

        $ hg cp a b

        $ hg mv a c

        $ echo 2 >> b

        $ echo 2 >> c

        $ hg ci -qAm "second"

        $ hg co -C 0

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

        $ echo 0 > a

        $ echo 1 >> a

        $ hg ci -qAm "other"

        $ hg merge --debug

          searching for copies back to rev 1

          unmatched files in other:

           b

           c

          all copies found (* = to merge, ! = divergent, % = renamed and deleted):

           src: 'a' -> dst: 'b' *

           src: 'a' -> dst: 'c' *

          checking for directory renames

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6

         preserving a for resolve of b

         preserving a for resolve of c

        removing a

         b: remote moved from a -> m

        updating: b 1/2 files (50.00%)

        picked tool 'internal:merge' for b (binary False symlink False)

        merging a and b to b

        my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc

         premerge successful

         c: remote moved from a -> m

        updating: c 2/2 files (100.00%)

        picked tool 'internal:merge' for c (binary False symlink False)

        merging a and c to c

        my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc

         premerge successful

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

        (branch merge, don't forget to commit)

      file b

        $ cat b

        0

        1

        2

      file c

        $ cat c

        0

        1

        2

        $ 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

				$ hg init t
				$ cd t

				$ echo 1 > a
				$ hg ci -qAm "first"

				$ hg cp a b
				$ hg mv a c
				$ echo 2 >> b
				$ echo 2 >> c

				$ hg ci -qAm "second"

				$ hg co -C 0
				1 files updated, 0 files merged, 2 files removed, 0 files unresolved

				$ echo 0 > a
				$ echo 1 >> a

				$ hg ci -qAm "other"

				$ hg merge --debug
				searching for copies back to rev 1
				unmatched files in other:
				b
				c
				all copies found (* = to merge, ! = divergent, % = renamed and deleted):
				src: 'a' -> dst: 'b' *
				src: 'a' -> dst: 'c' *
				checking for directory renames
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
				preserving a for resolve of b
				preserving a for resolve of c
				removing a
				b: remote moved from a -> m
				updating: b 1/2 files (50.00%)
				picked tool 'internal:merge' for b (binary False symlink False)
				merging a and b to b
				my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
				premerge successful
				c: remote moved from a -> m
				updating: c 2/2 files (100.00%)
				picked tool 'internal:merge' for c (binary False symlink False)
				merging a and c to c
				my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
				premerge successful
				0 files updated, 2 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				file b
				$ cat b
				0
				1
				2

				file c
				$ cat c
				0
				1
				2

				$ cd ..