upstream/mercurial-mirror Files · tests/test-merge10.t

rhg: add resolve_file_args to path_utils.rs...

rhg: add resolve_file_args to path_utils.rs Extracted logic for resolving `FILE ...` arguments from cat.rs into a new function in path_utils.rs. I plan to use this for rhg annotate. I tried to reuse hg::utils::files::canonical_path instead, but that didn't work. For example it reports a InsideDotHg error for any path containing "..".

Martin von Zweigbergk - - Load All Authors

File last commit:

r41573:f695726b default


                r53823:f33f37ac

tip default

Download file

             test-merge10.t
        
                    55 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge10.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb

      (merge correctly when all the files in a directory are moved

      but then local changes are added in the same directory)

        $ hg init a

        $ cd a

        $ mkdir -p testdir

        $ echo a > testdir/a

        $ hg add testdir/a

        $ hg commit -m a

        $ cd ..

        $ hg clone a b

        updating to branch default

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

        $ cd a

        $ echo alpha > testdir/a

        $ hg commit -m remote-change

        $ cd ..

        $ cd b

        $ mkdir testdir/subdir

        $ hg mv testdir/a testdir/subdir/a

        $ hg commit -m move

        $ mkdir newdir

        $ echo beta > newdir/beta

        $ hg add newdir/beta

        $ hg commit -m local-addition

        $ hg pull ../a

        pulling from ../a

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        new changesets cc7000b01af9

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg up -C 2

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

      Abuse this test for also testing that merge respects ui.relative-paths

        $ hg --cwd testdir merge --config ui.relative-paths=yes

        merging subdir/a and a to subdir/a

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

        (branch merge, don't forget to commit)

        $ hg stat

        M testdir/subdir/a

        $ hg diff --nodates

        diff -r bc21c9773bfa testdir/subdir/a

        --- a/testdir/subdir/a

        +++ b/testdir/subdir/a

        @@ -1,1 +1,1 @@

        -a

        +alpha

        $ 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

				Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb
				(merge correctly when all the files in a directory are moved
				but then local changes are added in the same directory)

				$ hg init a
				$ cd a
				$ mkdir -p testdir
				$ echo a > testdir/a
				$ hg add testdir/a
				$ hg commit -m a
				$ cd ..

				$ hg clone a b
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd a
				$ echo alpha > testdir/a
				$ hg commit -m remote-change
				$ cd ..

				$ cd b
				$ mkdir testdir/subdir
				$ hg mv testdir/a testdir/subdir/a
				$ hg commit -m move
				$ mkdir newdir
				$ echo beta > newdir/beta
				$ hg add newdir/beta
				$ hg commit -m local-addition
				$ hg pull ../a
				pulling from ../a
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				new changesets cc7000b01af9
				(run 'hg heads' to see heads, 'hg merge' to merge)
				$ hg up -C 2
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				Abuse this test for also testing that merge respects ui.relative-paths
				$ hg --cwd testdir merge --config ui.relative-paths=yes
				merging subdir/a and a to subdir/a
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg stat
				M testdir/subdir/a
				$ hg diff --nodates
				diff -r bc21c9773bfa testdir/subdir/a
				--- a/testdir/subdir/a
				+++ b/testdir/subdir/a
				@@ -1,1 +1,1 @@
				-a
				+alpha

				$ cd ..