mercurial/merge.py
Tue, 17 Oct 2006 22:59:01 -0500 Matt Mackall merge: fix branch setting
Tue, 17 Oct 2006 22:34:43 -0500 Matt Mackall imported patch foo
Sun, 15 Oct 2006 16:18:09 -0500 Matt Mackall merge: if filemerge skips merge, report as updated
Fri, 13 Oct 2006 17:58:04 -0500 Matt Mackall merge: update dirstate correctly for non-branchmerge updates
Thu, 12 Oct 2006 14:49:19 -0500 Matt Mackall merge: turn followcopies on by default
Tue, 10 Oct 2006 03:39:44 -0500 Matt Mackall merge: pull user messages out to hg.py
Tue, 10 Oct 2006 02:31:02 -0500 Matt Mackall merge: update some docstrings
Tue, 10 Oct 2006 02:15:20 -0500 Matt Mackall merge: various tidying
Tue, 10 Oct 2006 01:43:58 -0500 Matt Mackall merge: use contexts in checkunknown and forgetremoved
Tue, 10 Oct 2006 01:16:06 -0500 Matt Mackall merge: shortcircuit filemerge for identical files
Tue, 10 Oct 2006 00:54:00 -0500 Matt Mackall merge: pull file copy/move out of filemerge
Tue, 10 Oct 2006 00:41:55 -0500 Matt Mackall merge: unify merge and copy actions
Tue, 10 Oct 2006 00:32:30 -0500 Matt Mackall merge: swap file and mode args for act()
Tue, 10 Oct 2006 00:22:03 -0500 Matt Mackall merge: finish removing nodes from action list
Mon, 09 Oct 2006 23:23:25 -0500 Matt Mackall merge: eliminate nodes from action list
Mon, 09 Oct 2006 21:27:04 -0500 Matt Mackall filemerge: use contexts rather than my and other
Mon, 09 Oct 2006 20:32:03 -0500 Matt Mackall merge: pass contexts to applyupdates
Mon, 09 Oct 2006 18:13:38 -0500 Matt Mackall merge: don't call hooks for revert
Mon, 09 Oct 2006 16:07:19 -0500 Matt Mackall merge: use contexts for manifestmerge
Sun, 08 Oct 2006 19:57:45 -0500 Matt Mackall merge: remember rename copies and parents properly on commit
Fri, 06 Oct 2006 16:55:11 -0500 Matt Mackall merge: copy fixes and tests
Wed, 04 Oct 2006 19:08:04 -0500 Matt Mackall merge: fixes for merge+rename
Wed, 04 Oct 2006 15:43:27 -0500 Matt Mackall merge: add rename following
Wed, 04 Oct 2006 14:33:22 -0500 Matt Mackall merge: reduce manifest copying
Wed, 04 Oct 2006 14:09:26 -0500 Matt Mackall merge: reorder dirstate update slightly for correctness
Tue, 03 Oct 2006 01:21:46 -0500 Matt Mackall merge: use new working context object in update
Mon, 02 Oct 2006 12:06:33 -0500 Matt Mackall merge: remove old merge function
Mon, 02 Oct 2006 12:04:48 -0500 Matt Mackall merge: extend file merge function for renames
Fri, 29 Sep 2006 17:50:59 -0500 Matt Mackall merge: minor nullid cleanup
Fri, 29 Sep 2006 16:39:38 -0500 Matt Mackall merge: use repo.parents and parent contexts in update
Tue, 26 Sep 2006 16:21:52 -0500 Matt Mackall merge: move partial filtering out of manifest merge
Tue, 26 Sep 2006 16:04:07 -0500 Matt Mackall merge: move findcopies after workingmanifest
Tue, 26 Sep 2006 15:58:51 -0500 Matt Mackall findcopies: shortcut for empty working dir
Mon, 25 Sep 2006 20:31:05 -0500 Matt Mackall findcopies: use dirstate rename information
Mon, 25 Sep 2006 16:45:31 -0500 Matt Mackall Add core copy detection algorithm
Sun, 17 Sep 2006 21:27:30 -0500 Matt Mackall merge: simplify actions with helper function
Sun, 17 Sep 2006 21:11:26 -0500 Matt Mackall merge: simplify local created logic
Sun, 17 Sep 2006 20:43:06 -0500 Matt Mackall merge: simplify prompt code
Sun, 17 Sep 2006 20:38:02 -0500 Matt Mackall merge: simplify exec flag handling
Sun, 17 Sep 2006 20:18:27 -0500 Matt Mackall merge: simplify tests for local changed/remote deleted
Sun, 17 Sep 2006 20:10:54 -0500 Matt Mackall merge: more simplification of m2 manifest scanning
Sun, 17 Sep 2006 20:00:14 -0500 Matt Mackall merge: reorder tests on m2 items in manifestmerge
Sun, 17 Sep 2006 19:54:01 -0500 Matt Mackall merge: eliminate redundant security check
Sun, 17 Sep 2006 19:53:19 -0500 Matt Mackall merge: eliminate confusing queued variable
Sun, 17 Sep 2006 18:28:50 -0500 Matt Mackall merge: remove no longer possible clause
Sun, 17 Sep 2006 17:39:19 -0500 Matt Mackall merge: move apply and dirstate code into separate functions
Sun, 17 Sep 2006 17:13:02 -0500 Matt Mackall merge: remove linear variable
Sun, 17 Sep 2006 17:07:44 -0500 Matt Mackall merge: simplify hook code
Sun, 17 Sep 2006 16:50:17 -0500 Matt Mackall merge: linear_path -> linear
Sun, 17 Sep 2006 16:47:33 -0500 Matt Mackall merge: pull manifest checks and updates into separate functions
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
less more (0) -60 tip