| Thu, 05 Nov 2009 10:53:36 +0100 |
Stuart W Marks |
update: add comments and test cases for updating across branches
|
| Sat, 19 Sep 2009 01:15:38 +0200 |
Martin Geisler |
do not attempt to translate ui.debug output
|
| Sun, 21 Jun 2009 01:13:19 +0200 |
Simon Heimberg |
ui: extract choice from prompt
|
| Sun, 05 Jul 2009 11:01:01 +0200 |
Alejandro Santos |
compat: can't compare two values of unequal datatypes
|
| Mon, 15 Jun 2009 02:45:38 -0500 |
Matt Mackall |
subrepo: add update/merge logic
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: refactor manifestmerge init to better report effective ancestor
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify file revision comparison logic
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: make locally-added file test more correct
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop unused diverge initialization
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: refactor some initialization, drop backwards var
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: combine a copy and move case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop a flag update case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: combine three identical 'remote is newer' cases
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop 'remote deleted' case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify 'other deleted' case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify backwards revert test, ready to combine with other cases
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: allow merging going backwards
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: reorder remote creation tests
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop recreating case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop an overwrite test
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify a delete case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: reorder get cases for future simplification
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: fix prompt keep
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: remove a flags case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: pretend ancestor is local to simplify backwards and overwrite
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify flag merging code slightly
|
| Fri, 22 May 2009 11:42:21 -0500 |
Steve Borho |
merge: give hint as to how to discover uncommitted changes
|
| Tue, 19 May 2009 03:59:58 +0200 |
Benoit Boissinot |
update --clean: do not unlink added files (issue575)
|
| Wed, 13 May 2009 14:08:39 +0200 |
Dirkjan Ochtman |
some modernization cleanups, forward compatibility
|
| Tue, 28 Apr 2009 17:40:46 +0200 |
Simon Heimberg |
separate import lines from mercurial and general python modules
|
| Thu, 30 Apr 2009 10:15:32 -0500 |
Steve Borho |
ui: replace regexp pattern with sequence of choices
|
| Sun, 26 Apr 2009 01:08:54 +0200 |
Martin Geisler |
updated license to be explicit about GPL version 2
|
| Wed, 22 Apr 2009 00:57:28 +0200 |
Martin Geisler |
replace set-like dictionaries with real sets
|
| Wed, 22 Apr 2009 02:01:22 +0200 |
Ronny Pfannschmidt |
switch lock releasing in the core from gc to explicit
|
| Mon, 16 Mar 2009 16:58:41 -0500 |
Matt Mackall |
resolve: move reset to localrepo.commit
|
| Sun, 15 Feb 2009 10:50:48 -0600 |
Matt Mackall |
merge: mark kept local files as readded on linear update (issue539)
|
| Tue, 13 Jan 2009 23:17:19 +0100 |
Patrick Mezard |
Merge with crew-stable
|
| Tue, 13 Jan 2009 22:41:06 +0100 |
Patrick Mezard |
merge: fix execute bit update issue introduced by 89207edf3973
|
| Mon, 12 Jan 2009 09:16:03 +0100 |
Dirkjan Ochtman |
use dict.iteritems() rather than dict.items()
|
| Wed, 07 Jan 2009 02:11:17 +0100 |
Benoit Boissinot |
correctly update dirstate after update+mode change (issue1456)
|
| Wed, 08 Oct 2008 16:22:08 -0500 |
Matt Mackall |
merge: fix bug going backwards for already reverted files (issue1303)
|
| Sun, 31 Aug 2008 16:12:02 +0200 |
Martin Geisler |
i18n: mark strings for translation in Mercurial
|
| Tue, 12 Aug 2008 17:47:08 +0200 |
Dirkjan Ochtman |
merge with crew-stable
|
| Sun, 10 Aug 2008 21:55:06 -0500 |
Matt Mackall |
util: set_flags shouldn't know about repo flag formats
|
| Tue, 01 Jul 2008 17:59:31 +0100 |
Paul Moore |
Sort removes first when applying updates (fixes issues 750 and 912)
|
| Fri, 27 Jun 2008 18:28:45 -0500 |
Matt Mackall |
util: add sort helper
|
| Thu, 26 Jun 2008 14:35:46 -0500 |
Matt Mackall |
use repo[changeid] to get a changectx
|
| Thu, 26 Jun 2008 13:58:24 -0500 |
Matt Mackall |
rename checkfolding to checkcase
|
| Thu, 26 Jun 2008 13:46:29 -0500 |
Matt Mackall |
use repo.changectx(None) to get a workingctx
|
| Sat, 12 Apr 2008 20:51:26 +0200 |
Patrick Mezard |
merge: replace readline() call, missing from posixfile_nt
|
| Fri, 11 Apr 2008 12:52:56 -0500 |
Matt Mackall |
resolve: new command
|
| Fri, 11 Apr 2008 12:04:26 +0200 |
Dirkjan Ochtman |
python-2.6: use sha wrapper from util for new merge code
|
| Thu, 10 Apr 2008 15:02:24 -0500 |
Matt Mackall |
merge: introduce mergestate
|
| Sat, 29 Mar 2008 12:39:47 -0500 |
Matt Mackall |
copies: skip directory rename checks when not merging
|
| Mon, 24 Mar 2008 20:28:13 +0100 |
Thomas Arendsen Hein |
Fix missing space in one of the new update messages.
|
| Mon, 24 Mar 2008 10:01:05 -0500 |
Matt Mackall |
update: better logic and messages for updates
|
| Sat, 22 Mar 2008 13:30:08 -0500 |
Matt Mackall |
update: no -C needed to switch branches without outstanding changes
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
diff: use copy smarts from copies.py
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
copies: move findcopies code to its own module
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: move symmetricdifferences to ancestor.py
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: simplify some helpers
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: more simplifications to checkcopies
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: simplify checkcopies
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: privatize some functions, unnest some others
|
| Fri, 14 Mar 2008 11:01:31 -0500 |
Alexis S. L. Carvalho |
merge: notice uncommited copies (issue1000)
|
| Fri, 14 Mar 2008 09:56:58 -0300 |
Alexis S. L. Carvalho |
merge: require --force when there are deleted files
|
| Wed, 12 Mar 2008 15:44:08 -0700 |
Alexis S. L. Carvalho |
merge: fix handling of deleted files
|
| Thu, 06 Mar 2008 22:23:26 +0100 |
Joel Rosdahl |
Expand import * to allow Pyflakes to find problems
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
filemerge: pull file-merging code into its own module
|
| Mon, 14 Jan 2008 16:28:32 -0600 |
Matt Mackall |
merge: add a bit more sanity to divergent copy checks
|
| Thu, 27 Dec 2007 22:47:44 -0600 |
Matt Mackall |
merge: add flag merging intelligence
|
| Thu, 27 Dec 2007 22:27:48 -0600 |
Matt Mackall |
merge: use util.set_flags
|
| Thu, 27 Dec 2007 22:27:37 -0600 |
Matt Mackall |
merge: simplify merge tests, fix exec flag bug
|
| Wed, 26 Dec 2007 23:03:32 +0100 |
Thomas Arendsen Hein |
merge with crew-stable
|
| Wed, 26 Dec 2007 22:47:16 +0100 |
Thomas Arendsen Hein |
Fix misleading error and prompts during update/merge (issue556)
|
| Sun, 02 Dec 2007 15:15:49 -0600 |
Matt Mackall |
update: default to tipmost branch if default branch doesn't exist
|
| Mon, 05 Nov 2007 18:49:35 -0200 |
Alexis S. L. Carvalho |
Honour the exec bit when we go back in time.
|
| Tue, 09 Oct 2007 17:25:24 -0500 |
Matt Mackall |
Merge with -stable
|
| Mon, 08 Oct 2007 18:47:22 -0500 |
Matt Mackall |
findcopies: fix rename bug
|
| Mon, 08 Oct 2007 18:47:22 -0500 |
Matt Mackall |
findcopies: fix rename bug
|
| Wed, 03 Oct 2007 23:09:36 +0200 |
Patrick Mezard |
merge: provide *_ISLINK environment vars to merge helper
|
| Thu, 04 Oct 2007 19:44:37 -0500 |
Matt Mackall |
merge: add debug diagnostics for findcopies
|
| Thu, 23 Aug 2007 01:48:29 -0300 |
Alexis S. L. Carvalho |
merge: forcefully mark files that we get from the second parent as dirty
|
| Sun, 12 Aug 2007 12:43:52 -0300 |
Alexis S. L. Carvalho |
merge with crew-stable
|
| Fri, 10 Aug 2007 10:46:03 -0700 |
Bryan O'Sullivan |
Make audit_path more stringent.
|
| Sun, 12 Aug 2007 12:15:10 -0300 |
Alexis S. L. Carvalho |
merge: fix a copy detection bug (issue672)
|
| Thu, 02 Aug 2007 13:23:53 -0500 |
Matt Mackall |
Merge with -stable
|
| Thu, 02 Aug 2007 12:29:10 -0500 |
Matt Mackall |
merge: avoid double deletion mentioned in issue636
|
| Wed, 01 Aug 2007 14:03:48 -0500 |
Matt Mackall |
Merge with stable
|
| Wed, 01 Aug 2007 12:33:12 -0500 |
Matt Mackall |
merge: do early copy to deal with issue636
|
| Thu, 26 Jul 2007 12:02:55 -0500 |
Matt Mackall |
Merge with -stable
|
| Thu, 26 Jul 2007 11:19:53 -0500 |
Matt Mackall |
merge: don't forget to update the dirstate for exec bit changes
|
| Sat, 21 Jul 2007 16:02:10 -0500 |
Matt Mackall |
Make repo locks recursive, eliminate all passing of lock/wlock
|
| Sat, 21 Jul 2007 16:02:10 -0500 |
Matt Mackall |
Use try/finally pattern to cleanup locks and transactions
|
| Sat, 21 Jul 2007 16:02:09 -0500 |
Matt Mackall |
dirstate: break update into separate functions
|
| Sun, 15 Jul 2007 14:43:38 -0500 |
Matt Mackall |
merge: fix unnecessary rename merges on linear update (issue631)
|
| Thu, 05 Jul 2007 16:01:07 -0500 |
Matt Mackall |
merge: fix adding untracked files on directory rename (issue612)
|
| Thu, 05 Jul 2007 13:34:18 -0500 |
Matt Mackall |
merge: make test for fast-forward merge stricter (issue619)
|
| Fri, 22 Jun 2007 20:44:40 -0300 |
Alexis S. L. Carvalho |
merge: fix small bug with a failed merge across a rename
|
| Thu, 21 Jun 2007 18:02:03 -0500 |
Matt Mackall |
merge: warn user about divergent renames
|
| Tue, 19 Jun 2007 08:51:34 +0200 |
Thomas Arendsen Hein |
Updated copyright notices and add "and others" to "hg version"
|
| Tue, 19 Jun 2007 08:06:37 +0200 |
Thomas Arendsen Hein |
Cleanup of whitespace, indentation and line continuation.
|
| Mon, 18 Jun 2007 12:38:54 -0700 |
Brendan Cully |
Make fast-forward merges full merges
|
| Tue, 08 May 2007 11:42:48 -0500 |
Matt Mackall |
Merge with stable
|
| Tue, 08 May 2007 02:59:13 -0500 |
Matt Mackall |
merge: fix spurious merges for copies in linear updates
|
| Sun, 06 May 2007 20:27:45 -0700 |
Brendan Cully |
Add fast-forward branch merging
|
| Thu, 03 May 2007 17:27:21 -0500 |
Matt Mackall |
Merge with stable
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: reorganize some hunks in findcopies
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: simplify a check in checkcopies
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: expand and simplify the invalid handling for directory moves
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: fix a bug detecting directory moves
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: clarify the findcopies code
|
| Mon, 16 Apr 2007 12:37:30 -0500 |
Matt Mackall |
Merge with stable
|
| Mon, 16 Apr 2007 12:24:52 -0500 |
Matt Mackall |
merge: fix quadratic behavior in find-copies
|
| Thu, 05 Apr 2007 17:09:31 -0500 |
Matt Mackall |
Merge with stable
|
| Thu, 05 Apr 2007 16:43:18 -0500 |
Matt Mackall |
merge: fix a bug where copies were ignored
|
| Thu, 05 Apr 2007 16:25:47 -0500 |
Matt Mackall |
merge: fix a bug where copies were getting ignored
|
| Fri, 16 Mar 2007 00:45:18 -0300 |
Alexis S. L. Carvalho |
Merge with crew-stable
|
| Wed, 14 Mar 2007 01:26:09 -0500 |
Matt Mackall |
Merge with -stable, fix small test failure
|
| Sat, 10 Mar 2007 17:45:32 -0800 |
Brendan Cully |
Merge with crew-stable
|
