| Sun, 15 Oct 2006 16:18:09 -0500 |
Matt Mackall |
merge: if filemerge skips merge, report as updated
|
file |
diff |
annotate
|
| Tue, 10 Oct 2006 02:15:20 -0500 |
Matt Mackall |
merge: various tidying
|
file |
diff |
annotate
|
| Tue, 10 Oct 2006 01:16:06 -0500 |
Matt Mackall |
merge: shortcircuit filemerge for identical files
|
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, 02 Oct 2006 12:04:48 -0500 |
Matt Mackall |
merge: extend file merge function for renames
|
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 17:13:02 -0500 |
Matt Mackall |
merge: remove linear variable
|
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 18:06:17 -0500 |
Matt Mackall |
merge: combine merge and get lists
|
file |
diff |
annotate
|
| Tue, 22 Aug 2006 17:08:38 -0500 |
Matt Mackall |
merge: simplify working dir manifest generation
|
file |
diff |
annotate
|
| Sun, 20 Aug 2006 22:51:56 -0500 |
Matt Mackall |
Only show long hashes with --debug, not --verbose
|
file |
diff |
annotate
|
| Fri, 18 Aug 2006 21:17:28 -0700 |
Vadim Gelfer |
merge.
|
file |
diff |
annotate
|
| Sun, 23 Jul 2006 09:04:14 -0700 |
Vadim Gelfer |
addremove: do not deprecate.
|
file |
diff |
annotate
|
| Tue, 15 Aug 2006 11:38:07 -0700 |
Vadim Gelfer |
merge with other head by default, not tip.
|
file |
diff |
annotate
|
| Wed, 09 Aug 2006 13:55:18 -0500 |
Matt Mackall |
Merge with crew, fix most tests
|
file |
diff |
annotate
|
| Mon, 07 Aug 2006 22:54:33 -0500 |
Matt Mackall |
Introduce update helper functions: update, merge, clean, and revert
|
file |
diff |
annotate
|
| Mon, 03 Jul 2006 19:28:31 +0200 |
Thomas Arendsen Hein |
Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
|
file |
diff |
annotate
|
| Sun, 14 May 2006 21:07:34 -0700 |
Vadim Gelfer |
deprecate 'update -m'. use 'merge' instead.
|
file |
diff |
annotate
|
| Wed, 03 May 2006 10:18:52 +0200 |
Thomas Arendsen Hein |
Corrected test output for deprecated addremove command.
|
file |
diff |
annotate
|
| Tue, 02 May 2006 18:44:02 +0200 |
Thomas Arendsen Hein |
Make hg update more verbose by default (issue12)
|
file |
diff |
annotate
|
| Fri, 14 Apr 2006 00:41:50 +0200 |
Benoit Boissinot |
fix update when a locally added file match the target revision
|
file |
diff |
annotate
|
| 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.
|
file |
diff |
annotate
|
| Wed, 29 Mar 2006 10:27:16 -0800 |
Vadim Gelfer |
add merge command. means same thing as "update -m".
|
file |
diff |
annotate
|
| Fri, 24 Mar 2006 14:53:23 +0100 |
mcmillen |
Spelling fix: "commited" -> "committed"
|
file |
diff |
annotate
|
| 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.
|
file |
diff |
annotate
|
| Mon, 13 Mar 2006 08:56:59 +0100 |
Benoit Boissinot |
ui: output the number of file updated/merged/removed/... on update
|
file |
diff |
annotate
|
| Wed, 01 Feb 2006 08:46:24 +0100 |
Benoit Boissinot |
abort when using 'update -m' and this is not a merge
|
file |
diff |
annotate
|
| Tue, 24 Jan 2006 15:02:10 +1300 |
mason |
Add new bdiff based unidiff generation.
|
file |
diff |
annotate
|
| Wed, 14 Dec 2005 22:19:03 -0600 |
Benoit Boissinot |
abort when merging two heads and repository has local changes
|
file |
diff |
annotate
|
| Mon, 26 Sep 2005 16:52:47 -0700 |
Matt Mackall |
Repair ancestor logic, fix up test cases
|
file |
diff |
annotate
|
| Sat, 20 Aug 2005 13:08:07 -0700 |
mpm |
Merge with jeffpc
|
file |
diff |
annotate
|
| Fri, 19 Aug 2005 23:23:42 -0800 |
Samuel Tardieu |
[PATCH] Print timezone offset when outputting dates
|
file |
diff |
annotate
|
| Tue, 16 Aug 2005 19:03:01 -0800 |
mpm |
run-tests: remove '+ hg' trick
|
file |
diff |
annotate
|
| Sat, 30 Jul 2005 09:00:14 -0800 |
mpm |
Merge with BOS
|
file |
diff |
annotate
|
| Sat, 30 Jul 2005 08:35:29 -0800 |
mpm |
Merge with TAH
|
file |
diff |
annotate
|
| Fri, 29 Jul 2005 15:21:02 +0100 |
Thomas Arendsen Hein |
Updated output of tests.
|
file |
diff |
annotate
|
| Fri, 29 Jul 2005 06:43:21 +0100 |
Thomas Arendsen Hein |
Merge with upstream
|
file |
diff |
annotate
|
| Wed, 27 Jul 2005 10:21:19 -0800 |
mpm |
Fix tests for short changeset hashes and hidden manifest hashes
|
file |
diff |
annotate
|
| Tue, 26 Jul 2005 19:23:59 -0800 |
mpm |
Fix up test results
|
file |
diff |
annotate
|
| Sat, 23 Jul 2005 10:00:56 -0500 |
mpm |
Fix local file changes being ignored after non-branch merge
|
file |
diff |
annotate
|
| Fri, 22 Jul 2005 19:46:02 -0800 |
Bryan O'Sullivan |
Update tests to match new addremove chattiness.
|
file |
diff |
annotate
|
| Thu, 21 Jul 2005 15:05:17 -0500 |
mpm |
Update tests to use commit -m and default -u
|
file |
diff |
annotate
|
| Thu, 21 Jul 2005 12:40:28 -0500 |
mpm |
Update test output for status change
|
file |
diff |
annotate
|
| Thu, 14 Jul 2005 22:56:55 -0800 |
mpm |
Merge with TAH
|
file |
diff |
annotate
|
| Thu, 14 Jul 2005 10:37:33 +0100 |
Thomas Arendsen Hein |
Removed extra newline in hg log when not using the --patch option, fixed tests.
|
file |
diff |
annotate
|
| Sun, 10 Jul 2005 16:19:36 -0800 |
Matt Mackall |
Fix up test for update flags
|
file |
diff |
annotate
|
| Sun, 10 Jul 2005 16:17:05 -0800 |
Andrew Thompson |
Remove references to 'cloning by hardlink' from tests.
|
file |
diff |
annotate
|
| Wed, 06 Jul 2005 22:27:25 -0800 |
Matt Mackall |
Update tests
|
file |
diff |
annotate
|
| Mon, 04 Jul 2005 12:54:42 -0800 |
Matt Mackall |
update tests
|
file |
diff |
annotate
|
| Sat, 02 Jul 2005 22:54:35 -0800 |
mpm |
options: kill -d for debug
|
file |
diff |
annotate
|
| Thu, 30 Jun 2005 23:28:16 -0800 |
mpm |
Merge with TAH
|
file |
diff |
annotate
|
| Fri, 01 Jul 2005 07:40:32 +0100 |
Thomas Arendsen Hein |
Add an empty line after description in verbose mode of show_changeset.
|
file |
diff |
annotate
|
| Mon, 27 Jun 2005 22:29:44 -0800 |
mpm |
Pull from TAH
|
file |
diff |
annotate
|
| Tue, 28 Jun 2005 07:05:55 +0100 |
Thomas Arendsen Hein |
Fixed test for previous change of 'hg -v history'.
|
file |
diff |
annotate
|
| Mon, 27 Jun 2005 06:17:28 +0100 |
Thomas Arendsen Hein |
Make show_changeset show added and deleted files in verbose mode.
|
file |
diff |
annotate
|
| Sun, 26 Jun 2005 15:20:46 -0800 |
mpm |
[PATCH] add clone command
|
file |
diff |
annotate
|
| Fri, 17 Jun 2005 20:37:23 +0100 |
Thomas Arendsen Hein |
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
|
file |
diff |
annotate
|
| Fri, 17 Jun 2005 11:03:03 +0100 |
Thomas Arendsen Hein |
Fixed tests for displaying tags in hg history and hg parents.
|
file |
diff |
annotate
|
| Thu, 16 Jun 2005 08:37:15 -0800 |
mpm |
test suite: fix timezone problems and port collision problem
|
file |
diff |
annotate
|