Mercurial > hg

log mercurial/merge.py @ 3106:4ec28446fca8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Sun, 17 Sep 2006 16:13:34 -0500 Matt Mackall merge: remove now unused umap dict
Sun, 17 Sep 2006 16:13:03 -0500 Matt Mackall merge: pull manifest comparison out into separate function
Sun, 17 Sep 2006 16:02:09 -0500 Matt Mackall Merge with mainline
Sun, 17 Sep 2006 15:59:59 -0500 Matt Mackall merge: move set_exec to actions
Sun, 17 Sep 2006 15:54:51 -0500 Matt Mackall merge: add forget to action list
Sun, 17 Sep 2006 15:24:00 -0500 Matt Mackall merge: add codes to action list, eliminate None elements
Sun, 17 Sep 2006 15:10:56 -0500 Matt Mackall merge: convert actions to list
Fri, 15 Sep 2006 15:22:45 -0500 Matt Mackall Merge with crew
Sat, 26 Aug 2006 11:19:00 +0200 Benoit Boissinot fix errors reported by pychecker
Tue, 22 Aug 2006 21:02:25 -0500 Matt Mackall merge: fold umap and added into m1 manifest
Tue, 22 Aug 2006 19:39:54 -0500 Matt Mackall merge: make unresolved a counter
Tue, 22 Aug 2006 19:32:16 -0500 Matt Mackall merge: use context code to retrieve manifests
Tue, 22 Aug 2006 19:12:09 -0500 Matt Mackall merge: add remove to the action hash
Tue, 22 Aug 2006 18:06:17 -0500 Matt Mackall merge: combine merge and get lists
Tue, 22 Aug 2006 17:42:55 -0500 Matt Mackall merge: remove redundant if
Tue, 22 Aug 2006 17:26:44 -0500 Matt Mackall merge: eliminate mw manifestdict, do everything with m1
Tue, 22 Aug 2006 17:20:09 -0500 Matt Mackall merge: eliminate usage of m1 after working manifest creation
Tue, 22 Aug 2006 17:08:38 -0500 Matt Mackall merge: simplify working dir manifest generation
Tue, 22 Aug 2006 16:47:27 -0500 Matt Mackall merge: simplify some update logic
Tue, 22 Aug 2006 16:23:29 -0500 Matt Mackall merge: hoist partial code out of manifest loops
Tue, 22 Aug 2006 16:12:54 -0500 Matt Mackall merge: minor simplification
Mon, 21 Aug 2006 14:25:56 -0500 Matt Mackall merge: rename mysterious variable
Mon, 21 Aug 2006 14:21:42 -0500 Matt Mackall merge: add backwards variable
Tue, 15 Aug 2006 23:17:06 -0500 Matt Mackall merge: consolidate dirstate updates
Tue, 15 Aug 2006 22:46:35 -0500 Matt Mackall merge: use file size stored in revlog index
Tue, 15 Aug 2006 18:30:21 -0500 Matt Mackall merge: move forgets to the apply stage
Tue, 15 Aug 2006 18:12:36 -0500 Matt Mackall trivial bool() cleanup
Tue, 15 Aug 2006 16:27:19 -0500 Matt Mackall merge: hoist some working manifest logic out of merge loop
Tue, 15 Aug 2006 16:12:51 -0500 Matt Mackall merge: working manifest new/changed
Tue, 15 Aug 2006 15:58:10 -0500 Matt Mackall merge: factor out exec bit merge function
Tue, 15 Aug 2006 15:45:45 -0500 Matt Mackall Use revlog hash comparison technique in merge
Mon, 14 Aug 2006 14:42:15 -0500 Matt Mackall Merge with crew
Sat, 12 Aug 2006 16:40:12 -0700 Vadim Gelfer remove localrepository.changes.
Mon, 14 Aug 2006 14:14:08 -0500 Matt Mackall merge: minor simplification
Wed, 09 Aug 2006 22:07:13 -0500 Matt Mackall Merge: use single objects for tracking manifests
Wed, 09 Aug 2006 17:11:01 -0500 Matt Mackall Merge: save away mode bit so that we don't need manifest later
Wed, 09 Aug 2006 15:03:46 -0500 Matt Mackall Merge manifest refactor work
Tue, 08 Aug 2006 10:56:48 -0500 Matt Mackall Merge: combine force and forcemerge arguments
Tue, 08 Aug 2006 10:35:19 -0500 Matt Mackall Merge: move most tests to the beginning
Tue, 08 Aug 2006 09:26:00 -0500 Matt Mackall Merge: refactor err and failedmerge -> unresolved
Tue, 08 Aug 2006 09:19:20 -0500 Matt Mackall Refactor update locking slightly
Tue, 08 Aug 2006 09:11:16 -0500 Matt Mackall Merge: combine choose and moddirstate to partial
Mon, 07 Aug 2006 23:53:04 -0500 Matt Mackall Rename merge.allow -> merge.branchmerge
Mon, 07 Aug 2006 16:47:06 -0500 Matt Mackall Merge with crew
Thu, 03 Aug 2006 15:24:41 -0500 Matt Mackall Move merge code to its own module
less more | (0) tip