| 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: allow merging going backwards
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: pretend ancestor is local to simplify backwards and overwrite
|
| Fri, 22 May 2009 11:42:21 -0500 |
Steve Borho |
merge: give hint as to how to discover uncommitted changes
|
| Thu, 10 Apr 2008 15:02:24 -0500 |
Matt Mackall |
merge: introduce mergestate
|
| Mon, 24 Mar 2008 10:01:05 -0500 |
Matt Mackall |
update: better logic and messages for updates
|
| Fri, 21 Mar 2008 14:52:24 +0100 |
Adrian Buehlmann |
clone: print "updating working directory" status message
|
| Fri, 21 Mar 2008 11:06:02 +0100 |
Dirkjan Ochtman |
warn about new heads on commit (issue842)
|
| Sat, 15 Mar 2008 22:03:18 -0300 |
Alexis S. L. Carvalho |
Revert cfebb175704f, fixing the output of 2 tests
|
| Sat, 15 Mar 2008 16:51:53 -0500 |
Matt Mackall |
update tests for copy detection changes
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
merge: allow smarter tool configuration
|
| Wed, 16 Jan 2008 11:14:24 -0600 |
Matt Mackall |
diff: don't show function name by default
|
| Thu, 04 Oct 2007 19:44:37 -0500 |
Matt Mackall |
merge: add debug diagnostics for findcopies
|
| Tue, 31 Oct 2006 13:02:49 +0100 |
Benoit Boissinot |
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
|
| Sun, 29 Oct 2006 13:08:10 +0100 |
Benoit Boissinot |
allow update to switch to a different branch if the repo is clean
|
| Sun, 15 Oct 2006 16:18:09 -0500 |
Matt Mackall |
merge: if filemerge skips merge, report as updated
|
| Tue, 10 Oct 2006 02:15:20 -0500 |
Matt Mackall |
merge: various tidying
|
| Tue, 10 Oct 2006 01:16:06 -0500 |
Matt Mackall |
merge: shortcircuit filemerge for identical files
|
| Mon, 09 Oct 2006 21:27:04 -0500 |
Matt Mackall |
filemerge: use contexts rather than my and other
|
| Mon, 02 Oct 2006 12:04:48 -0500 |
Matt Mackall |
merge: extend file merge function for renames
|
| 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 17:13:02 -0500 |
Matt Mackall |
merge: remove linear variable
|
| Tue, 22 Aug 2006 19:32:16 -0500 |
Matt Mackall |
merge: use context code to retrieve manifests
|
| Tue, 22 Aug 2006 18:06:17 -0500 |
Matt Mackall |
merge: combine merge and get lists
|
| Tue, 22 Aug 2006 17:08:38 -0500 |
Matt Mackall |
merge: simplify working dir manifest generation
|
| Sun, 20 Aug 2006 22:51:56 -0500 |
Matt Mackall |
Only show long hashes with --debug, not --verbose
|
| Fri, 18 Aug 2006 21:17:28 -0700 |
Vadim Gelfer |
merge.
|
| Sun, 23 Jul 2006 09:04:14 -0700 |
Vadim Gelfer |
addremove: do not deprecate.
|
| Tue, 15 Aug 2006 11:38:07 -0700 |
Vadim Gelfer |
merge with other head by default, not tip.
|
| Wed, 09 Aug 2006 13:55:18 -0500 |
Matt Mackall |
Merge with crew, fix most tests
|
| Mon, 07 Aug 2006 22:54:33 -0500 |
Matt Mackall |
Introduce update helper functions: update, merge, clean, and revert
|
| Mon, 03 Jul 2006 19:28:31 +0200 |
Thomas Arendsen Hein |
Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
|
| Sun, 14 May 2006 21:07:34 -0700 |
Vadim Gelfer |
deprecate 'update -m'. use 'merge' instead.
|
| Wed, 03 May 2006 10:18:52 +0200 |
Thomas Arendsen Hein |
Corrected test output for deprecated addremove command.
|
| Tue, 02 May 2006 18:44:02 +0200 |
Thomas Arendsen Hein |
Make hg update more verbose by default (issue12)
|
| Fri, 14 Apr 2006 00:41:50 +0200 |
Benoit Boissinot |
fix update when a locally added file match the target revision
|
| Sun, 02 Apr 2006 18:16:06 +0200 |
Thomas Arendsen Hein |
Tell the user the real "hg update -C" command, not just "-C" when aborting.
|
| Wed, 29 Mar 2006 10:27:16 -0800 |
Vadim Gelfer |
add merge command. means same thing as "update -m".
|
| Fri, 24 Mar 2006 14:53:23 +0100 |
mcmillen |
Spelling fix: "commited" -> "committed"
|
| Mon, 13 Mar 2006 13:05:41 +0100 |
Thomas Arendsen Hein |
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
|
| Mon, 13 Mar 2006 08:56:59 +0100 |
Benoit Boissinot |
ui: output the number of file updated/merged/removed/... on update
|
| Wed, 01 Feb 2006 08:46:24 +0100 |
Benoit Boissinot |
abort when using 'update -m' and this is not a merge
|
| Tue, 24 Jan 2006 15:02:10 +1300 |
mason |
Add new bdiff based unidiff generation.
|
| Wed, 14 Dec 2005 22:19:03 -0600 |
Benoit Boissinot |
abort when merging two heads and repository has local changes
|
| Mon, 26 Sep 2005 16:52:47 -0700 |
Matt Mackall |
Repair ancestor logic, fix up test cases
|
| Sat, 20 Aug 2005 13:08:07 -0700 |
mpm |
Merge with jeffpc
|
| Fri, 19 Aug 2005 23:23:42 -0800 |
Samuel Tardieu |
[PATCH] Print timezone offset when outputting dates
|
| Tue, 16 Aug 2005 19:03:01 -0800 |
mpm |
run-tests: remove '+ hg' trick
|
| Sat, 30 Jul 2005 09:00:14 -0800 |
mpm |
Merge with BOS
|
| Sat, 30 Jul 2005 08:35:29 -0800 |
mpm |
Merge with TAH
|
| Fri, 29 Jul 2005 15:21:02 +0100 |
Thomas Arendsen Hein |
Updated output of tests.
|
| Fri, 29 Jul 2005 06:43:21 +0100 |
Thomas Arendsen Hein |
Merge with upstream
|
| Wed, 27 Jul 2005 10:21:19 -0800 |
mpm |
Fix tests for short changeset hashes and hidden manifest hashes
|
| Tue, 26 Jul 2005 19:23:59 -0800 |
mpm |
Fix up test results
|
| Sat, 23 Jul 2005 10:00:56 -0500 |
mpm |
Fix local file changes being ignored after non-branch merge
|
| Fri, 22 Jul 2005 19:46:02 -0800 |
Bryan O'Sullivan |
Update tests to match new addremove chattiness.
|
| Thu, 21 Jul 2005 15:05:17 -0500 |
mpm |
Update tests to use commit -m and default -u
|
| Thu, 21 Jul 2005 12:40:28 -0500 |
mpm |
Update test output for status change
|
| Thu, 14 Jul 2005 22:56:55 -0800 |
mpm |
Merge with TAH
|
