upstream/mercurial-mirror Files · mercurial/thirdparty/xdiff/xinclude.h

copies: distinguish between merged and touched files during upgrade...

copies: distinguish between merged and touched files during upgrade This a filenode being different between p1, p2 and result does not necessarily means a merges happens. For example p2 could be a strict newer version of p1, so the p2 version is picked by the manifest merging, but then the file is manually updated before the commit. In this case the file should be detected as touched. Differential Revision: https://phab.mercurial-scm.org/D10220

Jun Wu - - Load All Authors

File last commit:

r36781:90f8fe72 default


                r47571:433cef8f

default

Download file

             xinclude.h
        
                    40 lines
            
             | 1.1 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / thirdparty / xdiff / xinclude.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       *  LibXDiff by Davide Libenzi ( File Differential Library )

       *  Copyright (C) 2003  Davide Libenzi

       *

       *  This library is free software; you can redistribute it and/or

       *  modify it under the terms of the GNU Lesser General Public

       *  License as published by the Free Software Foundation; either

       *  version 2.1 of the License, or (at your option) any later version.

       *

       *  This library is distributed in the hope that it will be useful,

       *  but WITHOUT ANY WARRANTY; without even the implied warranty of

       *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

       *  Lesser General Public License for more details.

       *

       *  You should have received a copy of the GNU Lesser General Public

       *  License along with this library; if not, see

       *  <http://www.gnu.org/licenses/>.

       *

       *  Davide Libenzi <davidel@xmailserver.org>

       *

       */

      #if !defined(XINCLUDE_H)

      #define XINCLUDE_H

      #include <ctype.h>

      #include <stdio.h>

      #include <stdlib.h>

      #include <string.h>

      #include <limits.h>

      #include "xmacros.h"

      #include "xdiff.h"

      #include "xtypes.h"

      #include "xutils.h"

      #include "xprepare.h"

      #include "xdiffi.h"

      #endif /* #if !defined(XINCLUDE_H) */

	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

				/*
				* LibXDiff by Davide Libenzi ( File Differential Library )
				* Copyright (C) 2003 Davide Libenzi
				*
				* This library is free software; you can redistribute it and/or
				* modify it under the terms of the GNU Lesser General Public
				* License as published by the Free Software Foundation; either
				* version 2.1 of the License, or (at your option) any later version.
				*
				* This library is distributed in the hope that it will be useful,
				* but WITHOUT ANY WARRANTY; without even the implied warranty of
				* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
				* Lesser General Public License for more details.
				*
				* You should have received a copy of the GNU Lesser General Public
				* License along with this library; if not, see
				* <http://www.gnu.org/licenses/>.
				*
				* Davide Libenzi <davidel@xmailserver.org>
				*
				*/

				#if !defined(XINCLUDE_H)
				#define XINCLUDE_H

				#include <ctype.h>
				#include <stdio.h>
				#include <stdlib.h>
				#include <string.h>
				#include <limits.h>

				#include "xmacros.h"
				#include "xdiff.h"
				#include "xtypes.h"
				#include "xutils.h"
				#include "xprepare.h"
				#include "xdiffi.h"


				#endif /* #if !defined(XINCLUDE_H) */