upstream/mercurial-mirror Files · rust/hg-core/src/dirstate/dirstate_tree.rs

merge: store cases when a file is absent post merge in commitinfo...

merge: store cases when a file is absent post merge in commitinfo Some merges can result in file being absent form working directory. This can be one of file was kept deleted or file was removed by merge code. User might revert the file back before committing. In such cases we will like to have better handling and create new filenodes. We store this info in mergestate as commitinfo so that we can use it while committing to create new filenode if required. Differential Revision: https://phab.mercurial-scm.org/D9003

Raphaël Gomès - - Load All Authors

File last commit:

r46136:b51167d7 default


                r46161:76841247

default

Download file

             dirstate_tree.rs
        
                    14 lines
            
             | 398 B
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / hg-core / src / dirstate / dirstate_tree.rs
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      // dirstate_tree.rs

      //

      // Copyright 2020, Raphaël Gomès <rgomes@octobus.net>

      //

      // This software may be used and distributed according to the terms of the

      // GNU General Public License version 2 or any later version.

      //! Special-case radix tree that matches a filesystem hierarchy for use in the

      //! dirstate.

      //! It has not been optimized at all yet.

      pub mod iter;

      pub mod node;

      pub mod tree;

	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

				// dirstate_tree.rs
				//
				// Copyright 2020, Raphaël Gomès <rgomes@octobus.net>
				//
				// This software may be used and distributed according to the terms of the
				// GNU General Public License version 2 or any later version.

				//! Special-case radix tree that matches a filesystem hierarchy for use in the
				//! dirstate.
				//! It has not been optimized at all yet.

				pub mod iter;
				pub mod node;
				pub mod tree;