upstream/mercurial-mirror Files · tests/svn/replace.svndump

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.

Patrick Mezard - - Load All Authors

File last commit:

r13052:5fb924ee stable


                r23524:a1a7c94d

default

Download file

             replace.svndump
        
                    367 lines
            
             | 5.0 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / svn / replace.svndump

History | Annotation | Raw |Copy content |Copy permalink

				SVN-fs-dump-format-version: 2

				UUID: 97a955ef-0269-44f2-a58f-abd4ad400b2b

				Revision-number: 0
				Prop-content-length: 56
				Content-length: 56

				K 8
				svn:date
				V 27
				2010-11-26T18:01:12.912988Z
				PROPS-END

				Revision-number: 1
				Prop-content-length: 108
				Content-length: 108

				K 7
				svn:log
				V 7
				initial
				K 10
				svn:author
				V 7
				pmezard
				K 8
				svn:date
				V 27
				2010-11-26T18:01:13.106933Z
				PROPS-END

				Node-path: branches
				Node-kind: dir
				Node-action: add
				Prop-content-length: 10
				Content-length: 10

				PROPS-END


				Node-path: trunk
				Node-kind: dir
				Node-action: add
				Prop-content-length: 10
				Content-length: 10

				PROPS-END


				Node-path: trunk/a
				Node-kind: file
				Node-action: add
				Prop-content-length: 10
				Text-content-length: 2
				Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
				Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
				Content-length: 12

				PROPS-END
				a


				Node-path: trunk/d
				Node-kind: dir
				Node-action: add
				Prop-content-length: 10
				Content-length: 10

				PROPS-END


				Node-path: trunk/d/b
				Node-kind: file
				Node-action: add
				Prop-content-length: 10
				Text-content-length: 2
				Text-content-md5: 3b5d5c3712955042212316173ccf37be
				Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b
				Content-length: 12

				PROPS-END
				b


				Node-path: trunk/d2
				Node-kind: dir
				Node-action: add
				Prop-content-length: 10
				Content-length: 10

				PROPS-END


				Node-path: trunk/d2/a
				Node-kind: file
				Node-action: add
				Prop-content-length: 10
				Text-content-length: 2
				Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
				Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
				Content-length: 12

				PROPS-END
				a


				Node-path: trunk/dlink
				Node-kind: file
				Node-action: add
				Prop-content-length: 33
				Text-content-length: 6
				Text-content-md5: cca56829f18345718a4980bb02b6d8c3
				Text-content-sha1: 7c54cc5d472b78c94a04382df34b0f4f0f4f2d49
				Content-length: 39

				K 11
				svn:special
				V 1
				*
				PROPS-END
				link d

				Node-path: trunk/dlink2
				Node-kind: file
				Node-action: add
				Prop-content-length: 33
				Text-content-length: 6
				Text-content-md5: cca56829f18345718a4980bb02b6d8c3
				Text-content-sha1: 7c54cc5d472b78c94a04382df34b0f4f0f4f2d49
				Content-length: 39

				K 11
				svn:special
				V 1
				*
				PROPS-END
				link d

				Node-path: trunk/dlink3
				Node-kind: file
				Node-action: add
				Prop-content-length: 33
				Text-content-length: 6
				Text-content-md5: cca56829f18345718a4980bb02b6d8c3
				Text-content-sha1: 7c54cc5d472b78c94a04382df34b0f4f0f4f2d49
				Content-length: 39

				K 11
				svn:special
				V 1
				*
				PROPS-END
				link d

				Revision-number: 2
				Prop-content-length: 117
				Content-length: 117

				K 7
				svn:log
				V 15
				clobber symlink
				K 10
				svn:author
				V 7
				pmezard
				K 8
				svn:date
				V 27
				2010-11-26T18:01:14.073483Z
				PROPS-END

				Node-path: trunk/dlink3
				Node-kind: file
				Node-action: change
				Prop-content-length: 10
				Text-content-length: 2
				Text-content-md5: e29311f6f1bf1af907f9ef9f44b8328b
				Text-content-sha1: e983f374794de9c64e3d1c1de1d490c0756eeeff
				Content-length: 12

				PROPS-END
				d


				Revision-number: 3
				Prop-content-length: 106
				Content-length: 106

				K 7
				svn:log
				V 8
				clobber1
				K 10
				svn:author
				V 4
				evil
				K 8
				svn:date
				V 27
				2010-11-26T18:01:16.205184Z
				PROPS-END

				Node-path: trunk/a
				Node-kind: dir
				Node-action: delete

				Node-path: trunk/a
				Node-kind: dir
				Node-action: add
				Node-copyfrom-rev: 2
				Node-copyfrom-path: trunk/d




				Node-path: trunk/dlink
				Node-kind: dir
				Node-action: delete

				Node-path: trunk/dlink
				Node-kind: dir
				Node-action: add
				Node-copyfrom-rev: 2
				Node-copyfrom-path: trunk/d




				Revision-number: 4
				Prop-content-length: 106
				Content-length: 106

				K 7
				svn:log
				V 8
				clobber2
				K 10
				svn:author
				V 4
				evil
				K 8
				svn:date
				V 27
				2010-11-26T18:01:16.395962Z
				PROPS-END

				Node-path: trunk/dlink3
				Node-kind: file
				Node-action: delete

				Node-path: trunk/dlink3
				Node-kind: file
				Node-action: add
				Node-copyfrom-rev: 3
				Node-copyfrom-path: trunk/dlink2
				Text-copy-source-md5: cca56829f18345718a4980bb02b6d8c3
				Text-copy-source-sha1: 7c54cc5d472b78c94a04382df34b0f4f0f4f2d49




				Revision-number: 5
				Prop-content-length: 106
				Content-length: 106

				K 7
				svn:log
				V 5
				adddb
				K 10
				svn:author
				V 7
				pmezard
				K 8
				svn:date
				V 27
				2010-11-26T18:01:16.445072Z
				PROPS-END

				Node-path: trunk/d2/b
				Node-kind: file
				Node-action: add
				Prop-content-length: 10
				Text-content-length: 2
				Text-content-md5: 3b5d5c3712955042212316173ccf37be
				Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b
				Content-length: 12

				PROPS-END
				b


				Revision-number: 6
				Prop-content-length: 107
				Content-length: 107

				K 7
				svn:log
				V 6
				branch
				K 10
				svn:author
				V 7
				pmezard
				K 8
				svn:date
				V 27
				2010-11-26T18:01:19.075874Z
				PROPS-END

				Node-path: branches/branch
				Node-kind: dir
				Node-action: add
				Node-copyfrom-rev: 5
				Node-copyfrom-path: trunk


				Node-path: branches/branch/d2/c
				Node-kind: file
				Node-action: add
				Prop-content-length: 10
				Text-content-length: 2
				Text-content-md5: 2cd6ee2c70b0bde53fbe6cac3c8b8bb1
				Text-content-sha1: 2b66fd261ee5c6cfc8de7fa466bab600bcfe4f69
				Content-length: 12

				PROPS-END
				c


				Node-path: branches/branch/d2/b
				Node-action: delete


				Revision-number: 7
				Prop-content-length: 109
				Content-length: 109

				K 7
				svn:log
				V 10
				clobberdir
				K 10
				svn:author
				V 4
				evil
				K 8
				svn:date
				V 27
				2010-11-26T18:01:21.202158Z
				PROPS-END

				Node-path: trunk/d2
				Node-kind: dir
				Node-action: delete

				Node-path: trunk/d2
				Node-kind: dir
				Node-action: add
				Node-copyfrom-rev: 6
				Node-copyfrom-path: branches/branch/d2

	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