| Sat, 21 Jul 2007 16:02:10 -0500 |
Matt Mackall |
Use try/finally pattern to cleanup locks and transactions
|
file |
diff |
annotate
|
| Sat, 21 Jul 2007 16:02:09 -0500 |
Matt Mackall |
dirstate: break update into separate functions
|
file |
diff |
annotate
|
| Sun, 15 Jul 2007 14:43:38 -0500 |
Matt Mackall |
merge: fix unnecessary rename merges on linear update (issue631)
|
file |
diff |
annotate
|
| Thu, 05 Jul 2007 16:01:07 -0500 |
Matt Mackall |
merge: fix adding untracked files on directory rename (issue612)
|
file |
diff |
annotate
|
| Thu, 05 Jul 2007 13:34:18 -0500 |
Matt Mackall |
merge: make test for fast-forward merge stricter (issue619)
|
file |
diff |
annotate
|
| Fri, 22 Jun 2007 20:44:40 -0300 |
Alexis S. L. Carvalho |
merge: fix small bug with a failed merge across a rename
|
file |
diff |
annotate
|
| Thu, 21 Jun 2007 18:02:03 -0500 |
Matt Mackall |
merge: warn user about divergent renames
|
file |
diff |
annotate
|
| Tue, 19 Jun 2007 08:51:34 +0200 |
Thomas Arendsen Hein |
Updated copyright notices and add "and others" to "hg version"
|
file |
diff |
annotate
|
| Tue, 19 Jun 2007 08:06:37 +0200 |
Thomas Arendsen Hein |
Cleanup of whitespace, indentation and line continuation.
|
file |
diff |
annotate
|
| Mon, 18 Jun 2007 12:38:54 -0700 |
Brendan Cully |
Make fast-forward merges full merges
|
file |
diff |
annotate
|
| Tue, 08 May 2007 11:42:48 -0500 |
Matt Mackall |
Merge with stable
|
file |
diff |
annotate
|
| Tue, 08 May 2007 02:59:13 -0500 |
Matt Mackall |
merge: fix spurious merges for copies in linear updates
|
file |
diff |
annotate
|
| Sun, 06 May 2007 20:27:45 -0700 |
Brendan Cully |
Add fast-forward branch merging
|
file |
diff |
annotate
|
| Thu, 03 May 2007 17:27:21 -0500 |
Matt Mackall |
Merge with stable
|
file |
diff |
annotate
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: reorganize some hunks in findcopies
|
file |
diff |
annotate
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: simplify a check in checkcopies
|
file |
diff |
annotate
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: expand and simplify the invalid handling for directory moves
|
file |
diff |
annotate
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: fix a bug detecting directory moves
|
file |
diff |
annotate
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: clarify the findcopies code
|
file |
diff |
annotate
|
| Mon, 16 Apr 2007 12:37:30 -0500 |
Matt Mackall |
Merge with stable
|
file |
diff |
annotate
|
| Mon, 16 Apr 2007 12:24:52 -0500 |
Matt Mackall |
merge: fix quadratic behavior in find-copies
|
file |
diff |
annotate
|
| Thu, 05 Apr 2007 17:09:31 -0500 |
Matt Mackall |
Merge with stable
|
file |
diff |
annotate
|
| Thu, 05 Apr 2007 16:43:18 -0500 |
Matt Mackall |
merge: fix a bug where copies were ignored
|
file |
diff |
annotate
|
| Thu, 05 Apr 2007 16:25:47 -0500 |
Matt Mackall |
merge: fix a bug where copies were getting ignored
|
file |
diff |
annotate
|
| Fri, 16 Mar 2007 00:45:18 -0300 |
Alexis S. L. Carvalho |
Merge with crew-stable
|
file |
diff |
annotate
|
| Wed, 14 Mar 2007 01:26:09 -0500 |
Matt Mackall |
Merge with -stable, fix small test failure
|
file |
diff |
annotate
|
| Sat, 10 Mar 2007 17:45:32 -0800 |
Brendan Cully |
Merge with crew-stable
|
file |
diff |
annotate
|
| Tue, 13 Mar 2007 18:50:02 -0500 |
Matt Mackall |
Move branch read/write to dirstate where it belongs
|
file |
diff |
annotate
|
| Tue, 27 Feb 2007 16:47:16 -0600 |
Matt Mackall |
Merge with stable
|
file |
diff |
annotate
|
| Tue, 27 Feb 2007 16:20:06 -0600 |
Matt Mackall |
merge: fix renaming of subdirectories under renamed directories
|
file |
diff |
annotate
|