| Fri, 16 Oct 2009 23:57:34 +0200 |
Adrian Buehlmann |
hg.clone: report branch name on update
|
file |
diff |
annotate
|
| Thu, 17 Sep 2009 22:39:38 -0700 |
Stuart W Marks |
hg: say 'hg update' instead of 'hg up' in merge status message
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: refactor manifestmerge init to better report effective ancestor
|
file |
diff |
annotate
|
| Wed, 04 Mar 2009 13:06:16 -0600 |
Augie Fackler |
merge: better error messages to lead users to hg update --clean to abandon merges.
|
file |
diff |
annotate
|
| Fri, 11 Apr 2008 12:52:56 -0500 |
Matt Mackall |
resolve: new command
|
file |
diff |
annotate
|
| Thu, 10 Apr 2008 15:02:24 -0500 |
Matt Mackall |
merge: introduce mergestate
|
file |
diff |
annotate
|
| Fri, 21 Mar 2008 14:52:24 +0100 |
Adrian Buehlmann |
clone: print "updating working directory" status message
|
file |
diff |
annotate
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
merge: allow smarter tool configuration
|
file |
diff |
annotate
|
| Thu, 04 Oct 2007 19:44:37 -0500 |
Matt Mackall |
merge: add debug diagnostics for findcopies
|
file |
diff |
annotate
|
| Sat, 28 Apr 2007 17:55:45 -0300 |
Alexis S. L. Carvalho |
run-tests.py: pass -L/--label to simplemerge
|
file |
diff |
annotate
|
| Mon, 16 Apr 2007 20:17:39 -0300 |
Alexis S. L. Carvalho |
change tests to use simplemerge by default
|
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 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
|
| Wed, 09 Aug 2006 13:55:18 -0500 |
Matt Mackall |
Merge with crew, fix most tests
|
file |
diff |
annotate
|
| Sun, 14 May 2006 21:07:34 -0700 |
Vadim Gelfer |
deprecate 'update -m'. use 'merge' instead.
|
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
|
| Wed, 29 Mar 2006 10:27:16 -0800 |
Vadim Gelfer |
add merge command. means same thing as "update -m".
|
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
|
| Tue, 27 Sep 2005 14:53:11 -0700 |
Matt Mackall |
Make test-merge7 repeatable
|
file |
diff |
annotate
|
| Mon, 26 Sep 2005 16:52:47 -0700 |
Matt Mackall |
Repair ancestor logic, fix up test cases
|
file |
diff |
annotate
|