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

copyfile: allow optional hardlinking...

copyfile: allow optional hardlinking Some code paths use 'copyfiles' (full tree) for a single file to take advantage of the best-effort-hard-linking parameter. We add similar parameter and logic to 'copyfile' (single file) for this purpose. The single file version have the advantage to overwrite the destination file if it exists.

Matt Mackall - - Load All Authors

File last commit:

r16094:0776a6ca default


                r23899:4e451d13

default

Download file

             test-issue612.t
        
                    34 lines
            
             | 633 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue612.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      http://mercurial.selenic.com/bts/issue612

        $ hg init

        $ mkdir src

        $ echo a > src/a.c

        $ hg ci -Ama

        adding src/a.c

        $ hg mv src source

        moving src/a.c to source/a.c (glob)

        $ hg ci -Ammove

        $ hg co -C 0

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

        $ echo new > src/a.c

        $ echo compiled > src/a.o

        $ hg ci -mupdate

        created new head

        $ hg status

        ? src/a.o

        $ hg merge

        merging src/a.c and source/a.c to source/a.c

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

        (branch merge, don't forget to commit)

        $ hg status

        M source/a.c

        R src/a.c

        ? src/a.o

	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

				http://mercurial.selenic.com/bts/issue612

				$ hg init
				$ mkdir src
				$ echo a > src/a.c
				$ hg ci -Ama
				adding src/a.c

				$ hg mv src source
				moving src/a.c to source/a.c (glob)

				$ hg ci -Ammove

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

				$ echo new > src/a.c
				$ echo compiled > src/a.o
				$ hg ci -mupdate
				created new head

				$ hg status
				? src/a.o

				$ hg merge
				merging src/a.c and source/a.c to source/a.c
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg status
				M source/a.c
				R src/a.c
				? src/a.o