| Thu, 05 Nov 2009 10:53:59 +0100 |
Stuart W Marks |
update: allow branch crossing without -c or -C, with no uncommitted changes
|
file |
diff |
annotate
|
| Fri, 16 Oct 2009 23:57:34 +0200 |
Adrian Buehlmann |
hg.clone: report branch name on update
|
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
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: allow merging going backwards
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: pretend ancestor is local to simplify backwards and overwrite
|
file |
diff |
annotate
|
| Fri, 22 May 2009 11:42:21 -0500 |
Steve Borho |
merge: give hint as to how to discover uncommitted changes
|
file |
diff |
annotate
|
| Thu, 10 Apr 2008 15:02:24 -0500 |
Matt Mackall |
merge: introduce mergestate
|
file |
diff |
annotate
|
| Mon, 24 Mar 2008 10:01:05 -0500 |
Matt Mackall |
update: better logic and messages for updates
|
file |
diff |
annotate
|
| Fri, 21 Mar 2008 14:52:24 +0100 |
Adrian Buehlmann |
clone: print "updating working directory" status message
|
file |
diff |
annotate
|
| Fri, 21 Mar 2008 11:06:02 +0100 |
Dirkjan Ochtman |
warn about new heads on commit (issue842)
|
file |
diff |
annotate
|
| Sat, 15 Mar 2008 22:03:18 -0300 |
Alexis S. L. Carvalho |
Revert cfebb175704f, fixing the output of 2 tests
|
file |
diff |
annotate
|
| Sat, 15 Mar 2008 16:51:53 -0500 |
Matt Mackall |
update tests for copy detection changes
|
file |
diff |
annotate
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
merge: allow smarter tool configuration
|
file |
diff |
annotate
|
| Wed, 16 Jan 2008 11:14:24 -0600 |
Matt Mackall |
diff: don't show function name by default
|
file |
diff |
annotate
|
| Thu, 04 Oct 2007 19:44:37 -0500 |
Matt Mackall |
merge: add debug diagnostics for findcopies
|
file |
diff |
annotate
|
| Tue, 31 Oct 2006 13:02:49 +0100 |
Benoit Boissinot |
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
|
file |
diff |
annotate
|
| Sun, 29 Oct 2006 13:08:10 +0100 |
Benoit Boissinot |
allow update to switch to a different branch if the repo is clean
|
file |
diff |
annotate
|
| 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
|