/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/_dirstate_helpers_c.h

  • Committer: Robert Collins
  • Date: 2007-11-16 01:28:59 UTC
  • mto: This revision was merged to the branch mainline in revision 3015.
  • Revision ID: robertc@robertcollins.net-20071116012859-909bq5as99bj7hx2
Change check and reconcile to use the new _generate_text_key_index rather
than a _RevisionTextVersionCache in calculating the correct per-file
parent information. This exposed some test errors which got changed, and
reporting some aspects of inventory-text mismatches become harder to
report (but easier to calculate for when we do start correcting it).

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
#ifndef _DIRSTATE_HELPERS_C_H
 
2
#define _DIRSTATE_HELPERS_C_H
 
3
 
 
4
/* for intptr_t */
 
5
#ifdef _MSC_VER
 
6
#include <io.h>
 
7
#else
 
8
#include <stdint.h>
 
9
#endif
 
10
 
 
11
#endif