| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: handle directory renames
|
file |
diff |
annotate
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
|
file |
diff |
annotate
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: move check for empty ancestor into findcopies
|
file |
diff |
annotate
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: only store one direction of copies in the copy map
|
file |
diff |
annotate
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: add copied hash to simplify copy logic
|
file |
diff |
annotate
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: remove unused match logic from findcopies
|
file |
diff |
annotate
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: report destinations of moves in merge action messages
|
file |
diff |
annotate
|
| Mon, 27 Nov 2006 15:27:09 -0800 |
Brendan Cully |
Make context __eq__ handle arbitrary RHS values
|
file |
diff |
annotate
|
| Thu, 23 Nov 2006 22:45:00 -0800 |
Brendan Cully |
merge: Don't search for copies across unrelated manifests
|
file |
diff |
annotate
|
| Sat, 18 Nov 2006 11:34:19 -0600 |
Matt Mackall |
avoid unnecessary copy merges
|
file |
diff |
annotate
|
| Fri, 17 Nov 2006 08:06:54 +0100 |
Thomas Arendsen Hein |
white space and line break cleanups
|
file |
diff |
annotate
|
| Wed, 01 Nov 2006 21:47:55 -0600 |
Matt Mackall |
Clarify untracked file merge message
|
file |
diff |
annotate
|
| Tue, 31 Oct 2006 13:03:23 +0100 |
Benoit Boissinot |
merge with backout
|
file |
diff |
annotate
|
| Tue, 31 Oct 2006 13:02:49 +0100 |
Benoit Boissinot |
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
|
file |
diff |
annotate
|
| Sun, 29 Oct 2006 14:18:55 +0100 |
Benoit Boissinot |
use workingcontext.files() to detect if the repo is unclean
|
file |
diff |
annotate
|
| Sun, 29 Oct 2006 13:08:10 +0100 |
Benoit Boissinot |
allow update to switch to a different branch if the repo is clean
|
file |
diff |
annotate
|
| Sun, 29 Oct 2006 10:53:51 +0100 |
Thomas Arendsen Hein |
Define and use nullrev (revision of nullid) instead of -1.
|
file |
diff |
annotate
|
| Tue, 17 Oct 2006 22:59:01 -0500 |
Matt Mackall |
merge: fix branch setting
|
file |
diff |
annotate
|
| Tue, 17 Oct 2006 22:34:43 -0500 |
Matt Mackall |
imported patch foo
|
file |
diff |
annotate
|
| Sun, 15 Oct 2006 16:18:09 -0500 |
Matt Mackall |
merge: if filemerge skips merge, report as updated
|
file |
diff |
annotate
|
| Fri, 13 Oct 2006 17:58:04 -0500 |
Matt Mackall |
merge: update dirstate correctly for non-branchmerge updates
|
file |
diff |
annotate
|
| Thu, 12 Oct 2006 14:49:19 -0500 |
Matt Mackall |
merge: turn followcopies on by default
|
file |
diff |
annotate
|
| Tue, 10 Oct 2006 03:39:44 -0500 |
Matt Mackall |
merge: pull user messages out to hg.py
|
file |
diff |
annotate
|
| Tue, 10 Oct 2006 02:31:02 -0500 |
Matt Mackall |
merge: update some docstrings
|
file |
diff |
annotate
|
| Tue, 10 Oct 2006 02:15:20 -0500 |
Matt Mackall |
merge: various tidying
|
file |
diff |
annotate
|
| Tue, 10 Oct 2006 01:43:58 -0500 |
Matt Mackall |
merge: use contexts in checkunknown and forgetremoved
|
file |
diff |
annotate
|
| Tue, 10 Oct 2006 01:16:06 -0500 |
Matt Mackall |
merge: shortcircuit filemerge for identical files
|
file |
diff |
annotate
|
| Tue, 10 Oct 2006 00:54:00 -0500 |
Matt Mackall |
merge: pull file copy/move out of filemerge
|
file |
diff |
annotate
|
| Tue, 10 Oct 2006 00:41:55 -0500 |
Matt Mackall |
merge: unify merge and copy actions
|
file |
diff |
annotate
|
| Tue, 10 Oct 2006 00:32:30 -0500 |
Matt Mackall |
merge: swap file and mode args for act()
|
file |
diff |
annotate
|
| Tue, 10 Oct 2006 00:22:03 -0500 |
Matt Mackall |
merge: finish removing nodes from action list
|
file |
diff |
annotate
|
| Mon, 09 Oct 2006 23:23:25 -0500 |
Matt Mackall |
merge: eliminate nodes from action list
|
file |
diff |
annotate
|
| Mon, 09 Oct 2006 21:27:04 -0500 |
Matt Mackall |
filemerge: use contexts rather than my and other
|
file |
diff |
annotate
|
| Mon, 09 Oct 2006 20:32:03 -0500 |
Matt Mackall |
merge: pass contexts to applyupdates
|
file |
diff |
annotate
|
| Mon, 09 Oct 2006 18:13:38 -0500 |
Matt Mackall |
merge: don't call hooks for revert
|
file |
diff |
annotate
|
| Mon, 09 Oct 2006 16:07:19 -0500 |
Matt Mackall |
merge: use contexts for manifestmerge
|
file |
diff |
annotate
|
| Sun, 08 Oct 2006 19:57:45 -0500 |
Matt Mackall |
merge: remember rename copies and parents properly on commit
|
file |
diff |
annotate
|
| Fri, 06 Oct 2006 16:55:11 -0500 |
Matt Mackall |
merge: copy fixes and tests
|
file |
diff |
annotate
|
| Wed, 04 Oct 2006 19:08:04 -0500 |
Matt Mackall |
merge: fixes for merge+rename
|
file |
diff |
annotate
|
| Wed, 04 Oct 2006 15:43:27 -0500 |
Matt Mackall |
merge: add rename following
|
file |
diff |
annotate
|
| Wed, 04 Oct 2006 14:33:22 -0500 |
Matt Mackall |
merge: reduce manifest copying
|
file |
diff |
annotate
|
| Wed, 04 Oct 2006 14:09:26 -0500 |
Matt Mackall |
merge: reorder dirstate update slightly for correctness
|
file |
diff |
annotate
|
| Tue, 03 Oct 2006 01:21:46 -0500 |
Matt Mackall |
merge: use new working context object in update
|
file |
diff |
annotate
|
| Mon, 02 Oct 2006 12:06:33 -0500 |
Matt Mackall |
merge: remove old merge function
|
file |
diff |
annotate
|
| Mon, 02 Oct 2006 12:04:48 -0500 |
Matt Mackall |
merge: extend file merge function for renames
|
file |
diff |
annotate
|
| Fri, 29 Sep 2006 17:50:59 -0500 |
Matt Mackall |
merge: minor nullid cleanup
|
file |
diff |
annotate
|
| Fri, 29 Sep 2006 16:39:38 -0500 |
Matt Mackall |
merge: use repo.parents and parent contexts in update
|
file |
diff |
annotate
|
| Tue, 26 Sep 2006 16:21:52 -0500 |
Matt Mackall |
merge: move partial filtering out of manifest merge
|
file |
diff |
annotate
|
| Tue, 26 Sep 2006 16:04:07 -0500 |
Matt Mackall |
merge: move findcopies after workingmanifest
|
file |
diff |
annotate
|
| Tue, 26 Sep 2006 15:58:51 -0500 |
Matt Mackall |
findcopies: shortcut for empty working dir
|
file |
diff |
annotate
|
| Mon, 25 Sep 2006 20:31:05 -0500 |
Matt Mackall |
findcopies: use dirstate rename information
|
file |
diff |
annotate
|
| Mon, 25 Sep 2006 16:45:31 -0500 |
Matt Mackall |
Add core copy detection algorithm
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 21:27:30 -0500 |
Matt Mackall |
merge: simplify actions with helper function
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 21:11:26 -0500 |
Matt Mackall |
merge: simplify local created logic
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 20:43:06 -0500 |
Matt Mackall |
merge: simplify prompt code
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 20:38:02 -0500 |
Matt Mackall |
merge: simplify exec flag handling
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 20:18:27 -0500 |
Matt Mackall |
merge: simplify tests for local changed/remote deleted
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 20:10:54 -0500 |
Matt Mackall |
merge: more simplification of m2 manifest scanning
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 20:00:14 -0500 |
Matt Mackall |
merge: reorder tests on m2 items in manifestmerge
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 19:54:01 -0500 |
Matt Mackall |
merge: eliminate redundant security check
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 19:53:19 -0500 |
Matt Mackall |
merge: eliminate confusing queued variable
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 18:28:50 -0500 |
Matt Mackall |
merge: remove no longer possible clause
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 17:39:19 -0500 |
Matt Mackall |
merge: move apply and dirstate code into separate functions
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 17:13:02 -0500 |
Matt Mackall |
merge: remove linear variable
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 17:07:44 -0500 |
Matt Mackall |
merge: simplify hook code
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 16:50:17 -0500 |
Matt Mackall |
merge: linear_path -> linear
|
file |
diff |
annotate
|
| Sun, 17 Sep 2006 16:47:33 -0500 |
Matt Mackall |
merge: pull manifest checks and updates into separate functions
|
file |
diff |
annotate
|
| 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
|
| Sat, 26 Aug 2006 11:19:00 +0200 |
Benoit Boissinot |
fix errors reported by pychecker
|
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
|
| 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
|
| 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
|