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 |
|