| Tue, 15 Aug 2006 23:17:06 -0500 |
Matt Mackall |
merge: consolidate dirstate updates
|
file |
diff |
annotate
|
| Tue, 15 Aug 2006 22:46:35 -0500 |
Matt Mackall |
merge: use file size stored in revlog index
|
file |
diff |
annotate
|
| Tue, 15 Aug 2006 18:30:21 -0500 |
Matt Mackall |
merge: move forgets to the apply stage
|
file |
diff |
annotate
|
| Tue, 15 Aug 2006 18:12:36 -0500 |
Matt Mackall |
trivial bool() cleanup
|
file |
diff |
annotate
|
| Tue, 15 Aug 2006 16:27:19 -0500 |
Matt Mackall |
merge: hoist some working manifest logic out of merge loop
|
file |
diff |
annotate
|
| Tue, 15 Aug 2006 16:12:51 -0500 |
Matt Mackall |
merge: working manifest new/changed
|
file |
diff |
annotate
|
| Tue, 15 Aug 2006 15:58:10 -0500 |
Matt Mackall |
merge: factor out exec bit merge function
|
file |
diff |
annotate
|
| Tue, 15 Aug 2006 15:45:45 -0500 |
Matt Mackall |
Use revlog hash comparison technique in merge
|
file |
diff |
annotate
|
| Mon, 14 Aug 2006 14:42:15 -0500 |
Matt Mackall |
Merge with crew
|
file |
diff |
annotate
|
| Sat, 12 Aug 2006 16:40:12 -0700 |
Vadim Gelfer |
remove localrepository.changes.
|
file |
diff |
annotate
|
| Mon, 14 Aug 2006 14:14:08 -0500 |
Matt Mackall |
merge: minor simplification
|
file |
diff |
annotate
|
| Wed, 09 Aug 2006 22:07:13 -0500 |
Matt Mackall |
Merge: use single objects for tracking manifests
|
file |
diff |
annotate
|
| Wed, 09 Aug 2006 17:11:01 -0500 |
Matt Mackall |
Merge: save away mode bit so that we don't need manifest later
|
file |
diff |
annotate
|
| Wed, 09 Aug 2006 15:03:46 -0500 |
Matt Mackall |
Merge manifest refactor work
|
file |
diff |
annotate
|
| Tue, 08 Aug 2006 10:56:48 -0500 |
Matt Mackall |
Merge: combine force and forcemerge arguments
|
file |
diff |
annotate
|
| Tue, 08 Aug 2006 10:35:19 -0500 |
Matt Mackall |
Merge: move most tests to the beginning
|
file |
diff |
annotate
|
| Tue, 08 Aug 2006 09:26:00 -0500 |
Matt Mackall |
Merge: refactor err and failedmerge -> unresolved
|
file |
diff |
annotate
|
| Tue, 08 Aug 2006 09:19:20 -0500 |
Matt Mackall |
Refactor update locking slightly
|
file |
diff |
annotate
|
| Tue, 08 Aug 2006 09:11:16 -0500 |
Matt Mackall |
Merge: combine choose and moddirstate to partial
|
file |
diff |
annotate
|
| Mon, 07 Aug 2006 23:53:04 -0500 |
Matt Mackall |
Rename merge.allow -> merge.branchmerge
|
file |
diff |
annotate
|
| Mon, 07 Aug 2006 16:47:06 -0500 |
Matt Mackall |
Merge with crew
|
file |
diff |
annotate
|
| Thu, 03 Aug 2006 15:24:41 -0500 |
Matt Mackall |
Move merge code to its own module
|
file |
diff |
annotate
|