upstream/mercurial-mirror Files · contrib/xml.rnc

revert: properly revert to ancestor of p2 during merge (issue5052)...

revert: properly revert to ancestor of p2 during merge (issue5052) During merge, added (from one perspective) file can be reported as "modified". To work around that, revert was testing if modified file were present in the parent manifest and marking them as "added" in this case. However, we should be checking against the target revision manifest instead. Otherwise see file as "newly added" even if they exist in the target revision. That revert behavior regressed in 06fbd9518bc5.

Robert Bachmann - - Load All Authors

File last commit:

r10161:3acfb69a default


                r28192:cb6a952e

stable

Download file

             xml.rnc
        
                    41 lines
            
             | 1.2 KiB
            
                | application/relax-ng-compact-syntax
            
             |
                RNCCompactLexer
            
             / contrib / xml.rnc
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # RelaxNG schema for "xml" log style

      # Inspired by Subversion's XML log format.

      start = log

      node.type = xsd:string  {minLength = "40" maxLength = "40"}

      log = element log { logentry+ }

      logentry = element logentry {

          logentry.attlist,

          branch*, tag*, hgparent*,

          author, date,

          msg, paths?, copies?, extra*

      }

      logentry.attlist =

          attribute revision {xsd:nonNegativeInteger}

        & attribute node {node.type}

      branch = element branch { text }

      tag = element tag { text }

      hgparent = element parent {hgparent.attlist, text}

      hgparent.attlist =

          attribute revision {xsd:integer {minInclusive = "-1"} }

        & attribute node {node.type}

      author = element author { author.attlist, text }

      author.attlist =

          attribute email {text}

      date = element date {xsd:dateTime}

      msg = element msg {msg.attlist, text}

      msg.attlist =

          attribute xml:space {"preserve"}

      paths = element paths { path* }

      path = element path { path.attlist, text }

      path.attlist =

          # Action: (A)dd, (M)odify, (R)emove

          attribute action {"A"|"M"|"R"}

      copies = element copies { copy+ }

      copy = element copy { copy.attlist, text }

      copy.attlist =

          attribute source {text}

      extra = element extra {extra.attlist, text}

      extra.attlist =

          attribute key {text}

	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

				# RelaxNG schema for "xml" log style
				# Inspired by Subversion's XML log format.

				start = log
				node.type = xsd:string {minLength = "40" maxLength = "40"}

				log = element log { logentry+ }
				logentry = element logentry {
				logentry.attlist,
				branch, tag, hgparent*,
				author, date,
				msg, paths?, copies?, extra*
				}
				logentry.attlist =
				attribute revision {xsd:nonNegativeInteger}
				& attribute node {node.type}
				branch = element branch { text }
				tag = element tag { text }
				hgparent = element parent {hgparent.attlist, text}
				hgparent.attlist =
				attribute revision {xsd:integer {minInclusive = "-1"} }
				& attribute node {node.type}
				author = element author { author.attlist, text }
				author.attlist =
				attribute email {text}
				date = element date {xsd:dateTime}
				msg = element msg {msg.attlist, text}
				msg.attlist =
				attribute xml:space {"preserve"}
				paths = element paths { path* }
				path = element path { path.attlist, text }
				path.attlist =
				# Action: (A)dd, (M)odify, (R)emove
				attribute action {"A"\|"M"\|"R"}
				copies = element copies { copy+ }
				copy = element copy { copy.attlist, text }
				copy.attlist =
				attribute source {text}
				extra = element extra {extra.attlist, text}
				extra.attlist =
				attribute key {text}