facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity
5,692 Commits 24 Branches 62 Tags 322 MiB
614e20b215
Commit Graph

171 Commits

Author SHA1 Message Date
Matt Mackall
6f3c141b47 merge: move forgets to the apply stage 2006-08-15 18:30:21 -05:00
Matt Mackall
69d93c90a9 trivial bool() cleanup 2006-08-15 18:12:36 -05:00
Matt Mackall
61c48232d9 merge: hoist some working manifest logic out of merge loop 2006-08-15 16:27:19 -05:00
Matt Mackall
dd967a0972 merge: working manifest new/changed 
To remove dependence on m1 during manifest comparison, we distinguish between
new and changed states in mw.
 2006-08-15 16:12:51 -05:00
Matt Mackall
86a0d1f25a merge: factor out exec bit merge function 2006-08-15 15:58:10 -05:00
Matt Mackall
4483b407fd Use revlog hash comparison technique in merge 2006-08-15 15:45:45 -05:00
Matt Mackall
e6c07820a7 Merge with crew 2006-08-14 14:42:15 -05:00
Matt Mackall
d492a3834e merge: minor simplification 2006-08-14 14:14:08 -05:00
Vadim Gelfer
80d6f2f7c7 remove localrepository.changes. 
use localrepository.status instead.
 2006-08-12 16:40:12 -07:00
Matt Mackall
c676e5167a Merge: use single objects for tracking manifests 2006-08-09 22:07:13 -05:00
Matt Mackall
f048c758d8 Merge: save away mode bit so that we don't need manifest later 2006-08-09 17:11:01 -05:00
Matt Mackall
7c0506a4f5 Merge manifest refactor work 2006-08-09 15:03:46 -05:00
Matt Mackall
55b6f733d9 Merge: combine force and forcemerge arguments 2006-08-08 10:56:48 -05:00
Matt Mackall
94db72708b Merge: move most tests to the beginning 2006-08-08 10:35:19 -05:00
Matt Mackall
f8ef0497f7 Merge: refactor err and failedmerge -> unresolved 2006-08-08 09:26:00 -05:00
Matt Mackall
0b0ee1ba50 Refactor update locking slightly 2006-08-08 09:19:20 -05:00
Matt Mackall
60a6e68764 Merge: combine choose and moddirstate to partial 2006-08-08 09:11:16 -05:00
Matt Mackall
26928ff9de Rename merge.allow -> merge.branchmerge 2006-08-07 23:53:04 -05:00
Matt Mackall
3dcc28a29a Merge with crew 2006-08-07 16:47:06 -05:00
Matt Mackall
65b6faa1aa Move merge code to its own module 
Pull update and merge3 out of localrepo into merge.py
s/self/repo/
Add temporary API function in hg.py
Convert all users
 2006-08-03 15:24:41 -05:00
Benoit Boissinot
36b97cfba0 fix errors reported by pychecker 
mercurial/merge.py:174: No global (mode) found
mercurial/merge.py:253: No global (errno) found
 2006-08-26 11:19:00 +02:00