upstream/mercurial-mirror Files · rust/chg/build.rs

merge: move an inspection of the dirstate from record to calculate phase...

merge: move an inspection of the dirstate from record to calculate phase The intent is clearly to have `calculateupdates()` figure out what actions need to be taken and `recordupdates()` to make necessary modifications to the dirstate. However, in the `ACTION_PATH_CONFLICT_RESOLVE` case, there was one little inspection of copy information done in `recordupdates()`. This patch moves that to `calculateupdates()`. That will help with the next patch, which makes `merge.update()` work better with `overlayworkingctx` (copies should be recorded there too, even though we skip the `recordupdates()` step). Differential Revision: https://phab.mercurial-scm.org/D8615

Yuya Nishihara - - Load All Authors

File last commit:

r45179:1f5ab1a9 default


                r45465:818b4f19

default

Download file

             build.rs
        
                    7 lines
            
             | 155 B
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / chg / build.rs
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      fn main() {

          cc::Build::new()

              .warnings(true)

              .file("src/sendfds.c")

              .file("src/sighandlers.c")

              .compile("procutil");

      }

	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

				fn main() {
				cc::Build::new()
				.warnings(true)
				.file("src/sendfds.c")
				.file("src/sighandlers.c")
				.compile("procutil");
				}