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

transaction: use 'util.copyfile' for creating backup...

transaction: use 'util.copyfile' for creating backup Using 'copyfile' (single file) instead of 'copyfiles' (tree) will ensures destination file will be overwritten. This will prevent some abort if backup file are left in place for random reason. It also seems more correct.

Mads Kiilerich - - Load All Authors

File last commit:

r23749:a387b039 default


                r23900:5eb3541f

default

Download file

             test-issue1175.t
        
                    57 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1175.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: fix a bunch of pointless #s in unified tests

              r12328
            
      http://mercurial.selenic.com/bts/issue1175

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg init

        $ touch a

        $ hg ci -Am0

        adding a

        $ hg mv a a1

        $ hg ci -m1

        $ hg co 0

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

        $ hg mv a a2

        $ hg up

        Dan Villiom Podlaski Christiansen
    
merge: make 'diverging renames' diagnostic a more helpful note....

              r12757
            
        note: possible conflict - a was renamed multiple times to:

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
         a2

         a1

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

        $ hg ci -m2

        $ touch a

        $ hg ci -Am3

        adding a

        $ hg mv a b

        $ hg ci -Am4 a

        $ hg ci --debug --traceback -Am5 b

        Mads Kiilerich
    
localrepo: show headline notes in commitctx before showing filenames...

              r23749
            
        committing files:

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        b

         b: searching for copy revision for a

         b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db

        Mads Kiilerich
    
localrepo: show headline notes in commitctx before showing filenames...

              r23749
            
        committing manifest

        committing changelog

        Matt Mackall
    
setparents: drop copies from dropped p2 (issue3843)

              r18739
            
        committed changeset 5:732aafbecb501a198b3cc9323ad3899ff04ccf95

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        4 files, 6 changesets, 4 total revisions

        $ hg export --git tip

        # HG changeset patch

        # User test

        # Date 0 0

        Mads Kiilerich
    
export: show 'Date' header in a format that also is readable for humans...

              r18648
            
        #      Thu Jan 01 00:00:00 1970 +0000

        Matt Mackall
    
setparents: drop copies from dropped p2 (issue3843)

              r18739
            
        # Node ID 732aafbecb501a198b3cc9323ad3899ff04ccf95

        # Parent  1d1625283f71954f21d14c3d44d0ad3c019c597f

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        5

        diff --git a/b b/b

        new file mode 100644

	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

Matt Mackall tests: fix a bunch of pointless #s in unified tests	r12328	http://mercurial.selenic.com/bts/issue1175
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg init
		$ touch a
		$ hg ci -Am0
		adding a

		$ hg mv a a1
		$ hg ci -m1

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

		$ hg mv a a2
		$ hg up
Dan Villiom Podlaski Christiansen merge: make 'diverging renames' diagnostic a more helpful note....	r12757	note: possible conflict - a was renamed multiple times to:
Adrian Buehlmann tests: unify test-issue*	r12195	a2
		a1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ hg ci -m2

		$ touch a
		$ hg ci -Am3
		adding a

		$ hg mv a b
		$ hg ci -Am4 a

		$ hg ci --debug --traceback -Am5 b
Mads Kiilerich localrepo: show headline notes in commitctx before showing filenames...	r23749	committing files:
Adrian Buehlmann tests: unify test-issue*	r12195	b
		b: searching for copy revision for a
		b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db
Mads Kiilerich localrepo: show headline notes in commitctx before showing filenames...	r23749	committing manifest
		committing changelog
Matt Mackall setparents: drop copies from dropped p2 (issue3843)	r18739	committed changeset 5:732aafbecb501a198b3cc9323ad3899ff04ccf95
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		4 files, 6 changesets, 4 total revisions

		$ hg export --git tip
		# HG changeset patch
		# User test
		# Date 0 0
Mads Kiilerich export: show 'Date' header in a format that also is readable for humans...	r18648	# Thu Jan 01 00:00:00 1970 +0000
Matt Mackall setparents: drop copies from dropped p2 (issue3843)	r18739	# Node ID 732aafbecb501a198b3cc9323ad3899ff04ccf95
		# Parent 1d1625283f71954f21d14c3d44d0ad3c019c597f
Adrian Buehlmann tests: unify test-issue*	r12195	5

		diff --git a/b b/b
		new file mode 100644