| Wed, 07 Jan 2009 02:11:17 +0100 |
Benoit Boissinot |
correctly update dirstate after update+mode change (issue1456)
|
file |
diff |
annotate
|
| Wed, 08 Oct 2008 16:22:08 -0500 |
Matt Mackall |
merge: fix bug going backwards for already reverted files (issue1303)
|
file |
diff |
annotate
|
| Sun, 31 Aug 2008 16:12:02 +0200 |
Martin Geisler |
i18n: mark strings for translation in Mercurial
|
file |
diff |
annotate
|
| Tue, 12 Aug 2008 17:47:08 +0200 |
Dirkjan Ochtman |
merge with crew-stable
|
file |
diff |
annotate
|
| Sun, 10 Aug 2008 21:55:06 -0500 |
Matt Mackall |
util: set_flags shouldn't know about repo flag formats
|
file |
diff |
annotate
|
| Tue, 01 Jul 2008 17:59:31 +0100 |
Paul Moore |
Sort removes first when applying updates (fixes issues 750 and 912)
|
file |
diff |
annotate
|
| Fri, 27 Jun 2008 18:28:45 -0500 |
Matt Mackall |
util: add sort helper
|
file |
diff |
annotate
|
| Thu, 26 Jun 2008 14:35:46 -0500 |
Matt Mackall |
use repo[changeid] to get a changectx
|
file |
diff |
annotate
|
| Thu, 26 Jun 2008 13:58:24 -0500 |
Matt Mackall |
rename checkfolding to checkcase
|
file |
diff |
annotate
|
| Thu, 26 Jun 2008 13:46:29 -0500 |
Matt Mackall |
use repo.changectx(None) to get a workingctx
|
file |
diff |
annotate
|
| Sat, 12 Apr 2008 20:51:26 +0200 |
Patrick Mezard |
merge: replace readline() call, missing from posixfile_nt
|
file |
diff |
annotate
|
| Fri, 11 Apr 2008 12:52:56 -0500 |
Matt Mackall |
resolve: new command
|
file |
diff |
annotate
|
| Fri, 11 Apr 2008 12:04:26 +0200 |
Dirkjan Ochtman |
python-2.6: use sha wrapper from util for new merge code
|
file |
diff |
annotate
|
| Thu, 10 Apr 2008 15:02:24 -0500 |
Matt Mackall |
merge: introduce mergestate
|
file |
diff |
annotate
|
| Sat, 29 Mar 2008 12:39:47 -0500 |
Matt Mackall |
copies: skip directory rename checks when not merging
|
file |
diff |
annotate
|
| Mon, 24 Mar 2008 20:28:13 +0100 |
Thomas Arendsen Hein |
Fix missing space in one of the new update messages.
|
file |
diff |
annotate
|
| Mon, 24 Mar 2008 10:01:05 -0500 |
Matt Mackall |
update: better logic and messages for updates
|
file |
diff |
annotate
|
| Sat, 22 Mar 2008 13:30:08 -0500 |
Matt Mackall |
update: no -C needed to switch branches without outstanding changes
|
file |
diff |
annotate
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
diff: use copy smarts from copies.py
|
file |
diff |
annotate
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
copies: move findcopies code to its own module
|
file |
diff |
annotate
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: move symmetricdifferences to ancestor.py
|
file |
diff |
annotate
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: simplify some helpers
|
file |
diff |
annotate
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: more simplifications to checkcopies
|
file |
diff |
annotate
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: simplify checkcopies
|
file |
diff |
annotate
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: privatize some functions, unnest some others
|
file |
diff |
annotate
|
| Fri, 14 Mar 2008 11:01:31 -0500 |
Alexis S. L. Carvalho |
merge: notice uncommited copies (issue1000)
|
file |
diff |
annotate
|
| Fri, 14 Mar 2008 09:56:58 -0300 |
Alexis S. L. Carvalho |
merge: require --force when there are deleted files
|
file |
diff |
annotate
|
| Wed, 12 Mar 2008 15:44:08 -0700 |
Alexis S. L. Carvalho |
merge: fix handling of deleted files
|
file |
diff |
annotate
|
| Thu, 06 Mar 2008 22:23:26 +0100 |
Joel Rosdahl |
Expand import * to allow Pyflakes to find problems
|
file |
diff |
annotate
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
filemerge: pull file-merging code into its own module
|
file |
diff |
annotate
|