| 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: pretend ancestor is local to simplify backwards and overwrite
|
| Tue, 01 Jul 2008 17:59:31 +0100 |
Paul Moore |
Sort removes first when applying updates (fixes issues 750 and 912)
|
| Fri, 21 Mar 2008 11:06:02 +0100 |
Dirkjan Ochtman |
warn about new heads on commit (issue842)
|
| Tue, 10 Oct 2006 02:15:20 -0500 |
Matt Mackall |
merge: various tidying
|
| Sun, 17 Sep 2006 21:27:30 -0500 |
Matt Mackall |
merge: simplify actions with helper function
|
| 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
|
| 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
|
| Tue, 02 May 2006 18:44:02 +0200 |
Thomas Arendsen Hein |
Make hg update more verbose by default (issue12)
|
| 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
|
| Mon, 24 Oct 2005 20:42:20 -0700 |
Matt Mackall |
Remove deprecated commit -t option
|
| Tue, 13 Sep 2005 18:38:27 -0500 |
mpm |
Fix bug with co -C across branches, update tests
|
