/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: Vincent Ladeuil
  • Date: 2009-01-23 21:06:48 UTC
  • mto: (3966.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3967.
  • Revision ID: v.ladeuil+lp@free.fr-20090123210648-yfb39g22yyo83d3y
Slight refactoring and test fixing.

* bzrlib/tests/test_merge.py:
(TestMergerEntriesLCAOnDisk.test_modified_symlink): Passing now.

* bzrlib/merge.py:
(Merge3Merger._lca_multi_way): Fix doc reference.
(Merge3Merger.merge_contents.contents_conflict): Try to delay
this_pair evaulation to avoid unnecessary sha1 (impyling file read
from disk) calculation. Also slightly refactor to avoid repeated
file_id in trees calculations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_dirstate_helpers_c.h
 
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
 
 
9
#if defined(__SVR4) && defined(__sun)
 
10
#include <inttypes.h>
 
11
#else
 
12
#include <stdint.h>
 
13
#endif
 
14
 
 
15
#endif
 
16
 
 
17
#endif