Sun, 17 Sep 2006 16:13:34 -0500 |
Matt Mackall |
merge: remove now unused umap dict
|
file |
diff |
annotate
|
Sun, 17 Sep 2006 16:13:03 -0500 |
Matt Mackall |
merge: pull manifest comparison out into separate function
|
file |
diff |
annotate
|
Sun, 17 Sep 2006 16:02:09 -0500 |
Matt Mackall |
Merge with mainline
|
file |
diff |
annotate
|
Sun, 17 Sep 2006 15:59:59 -0500 |
Matt Mackall |
merge: move set_exec to actions
|
file |
diff |
annotate
|
Sun, 17 Sep 2006 15:54:51 -0500 |
Matt Mackall |
merge: add forget to action list
|
file |
diff |
annotate
|
Sun, 17 Sep 2006 15:24:00 -0500 |
Matt Mackall |
merge: add codes to action list, eliminate None elements
|
file |
diff |
annotate
|
Sun, 17 Sep 2006 15:10:56 -0500 |
Matt Mackall |
merge: convert actions to list
|
file |
diff |
annotate
|
Fri, 15 Sep 2006 15:22:45 -0500 |
Matt Mackall |
Merge with crew
|
file |
diff |
annotate
|
Tue, 22 Aug 2006 21:02:25 -0500 |
Matt Mackall |
merge: fold umap and added into m1 manifest
|
file |
diff |
annotate
|
Tue, 22 Aug 2006 19:39:54 -0500 |
Matt Mackall |
merge: make unresolved a counter
|
file |
diff |
annotate
|
Tue, 22 Aug 2006 19:32:16 -0500 |
Matt Mackall |
merge: use context code to retrieve manifests
|
file |
diff |
annotate
|
Sat, 26 Aug 2006 11:19:00 +0200 |
Benoit Boissinot |
fix errors reported by pychecker
|
file |
diff |
annotate
|
Tue, 22 Aug 2006 19:12:09 -0500 |
Matt Mackall |
merge: add remove to the action hash
|
file |
diff |
annotate
|
Tue, 22 Aug 2006 18:06:17 -0500 |
Matt Mackall |
merge: combine merge and get lists
|
file |
diff |
annotate
|
Tue, 22 Aug 2006 17:42:55 -0500 |
Matt Mackall |
merge: remove redundant if
|
file |
diff |
annotate
|
Tue, 22 Aug 2006 17:26:44 -0500 |
Matt Mackall |
merge: eliminate mw manifestdict, do everything with m1
|
file |
diff |
annotate
|
Tue, 22 Aug 2006 17:20:09 -0500 |
Matt Mackall |
merge: eliminate usage of m1 after working manifest creation
|
file |
diff |
annotate
|
Tue, 22 Aug 2006 17:08:38 -0500 |
Matt Mackall |
merge: simplify working dir manifest generation
|
file |
diff |
annotate
|
Tue, 22 Aug 2006 16:47:27 -0500 |
Matt Mackall |
merge: simplify some update logic
|
file |
diff |
annotate
|
Tue, 22 Aug 2006 16:23:29 -0500 |
Matt Mackall |
merge: hoist partial code out of manifest loops
|
file |
diff |
annotate
|
Tue, 22 Aug 2006 16:12:54 -0500 |
Matt Mackall |
merge: minor simplification
|
file |
diff |
annotate
|
Mon, 21 Aug 2006 14:25:56 -0500 |
Matt Mackall |
merge: rename mysterious variable
|
file |
diff |
annotate
|
Mon, 21 Aug 2006 14:21:42 -0500 |
Matt Mackall |
merge: add backwards variable
|
file |
diff |
annotate
|
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
|