| Tue, 12 Dec 2006 17:52:33 -0600 |
Matt Mackall |
Fix copy detection corner case
|
| Sun, 10 Dec 2006 20:35:28 -0200 |
Alexis S. L. Carvalho |
Use UTF-8 in .hg/branch
|
| Mon, 04 Dec 2006 17:10:31 -0600 |
Matt Mackall |
imported patch collision
|
| Sun, 03 Dec 2006 16:16:33 -0600 |
Matt Mackall |
Handle transcoding of branch names
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: handle directory renames
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: move check for empty ancestor into findcopies
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: only store one direction of copies in the copy map
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: add copied hash to simplify copy logic
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: remove unused match logic from findcopies
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: report destinations of moves in merge action messages
|
| Mon, 27 Nov 2006 15:27:09 -0800 |
Brendan Cully |
Make context __eq__ handle arbitrary RHS values
|
| Thu, 23 Nov 2006 22:45:00 -0800 |
Brendan Cully |
merge: Don't search for copies across unrelated manifests
|
| Sat, 18 Nov 2006 11:34:19 -0600 |
Matt Mackall |
avoid unnecessary copy merges
|
| Fri, 17 Nov 2006 08:06:54 +0100 |
Thomas Arendsen Hein |
white space and line break cleanups
|
| Wed, 01 Nov 2006 21:47:55 -0600 |
Matt Mackall |
Clarify untracked file merge message
|
| Tue, 31 Oct 2006 13:03:23 +0100 |
Benoit Boissinot |
merge with backout
|
| Tue, 31 Oct 2006 13:02:49 +0100 |
Benoit Boissinot |
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
|
| Sun, 29 Oct 2006 14:18:55 +0100 |
Benoit Boissinot |
use workingcontext.files() to detect if the repo is unclean
|
| Sun, 29 Oct 2006 13:08:10 +0100 |
Benoit Boissinot |
allow update to switch to a different branch if the repo is clean
|
| Sun, 29 Oct 2006 10:53:51 +0100 |
Thomas Arendsen Hein |
Define and use nullrev (revision of nullid) instead of -1.
|
| 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
|
