| Thu, 27 Dec 2007 22:47:44 -0600 |
Matt Mackall |
merge: add flag merging intelligence
|
file |
diff |
annotate
|
| Thu, 27 Dec 2007 22:27:48 -0600 |
Matt Mackall |
merge: use util.set_flags
|
file |
diff |
annotate
|
| Thu, 27 Dec 2007 22:27:37 -0600 |
Matt Mackall |
merge: simplify merge tests, fix exec flag bug
|
file |
diff |
annotate
|
| Wed, 26 Dec 2007 23:03:32 +0100 |
Thomas Arendsen Hein |
merge with crew-stable
|
file |
diff |
annotate
|
| Wed, 26 Dec 2007 22:47:16 +0100 |
Thomas Arendsen Hein |
Fix misleading error and prompts during update/merge (issue556)
|
file |
diff |
annotate
|
| Sun, 02 Dec 2007 15:15:49 -0600 |
Matt Mackall |
update: default to tipmost branch if default branch doesn't exist
|
file |
diff |
annotate
|
| Mon, 05 Nov 2007 18:49:35 -0200 |
Alexis S. L. Carvalho |
Honour the exec bit when we go back in time.
|
file |
diff |
annotate
|
| Tue, 09 Oct 2007 17:25:24 -0500 |
Matt Mackall |
Merge with -stable
|
file |
diff |
annotate
|
| Mon, 08 Oct 2007 18:47:22 -0500 |
Matt Mackall |
findcopies: fix rename bug
|
file |
diff |
annotate
|
| Mon, 08 Oct 2007 18:47:22 -0500 |
Matt Mackall |
findcopies: fix rename bug
|
file |
diff |
annotate
|
| Wed, 03 Oct 2007 23:09:36 +0200 |
Patrick Mezard |
merge: provide *_ISLINK environment vars to merge helper
|
file |
diff |
annotate
|
| Thu, 04 Oct 2007 19:44:37 -0500 |
Matt Mackall |
merge: add debug diagnostics for findcopies
|
file |
diff |
annotate
|
| Thu, 23 Aug 2007 01:48:29 -0300 |
Alexis S. L. Carvalho |
merge: forcefully mark files that we get from the second parent as dirty
|
file |
diff |
annotate
|
| Sun, 12 Aug 2007 12:43:52 -0300 |
Alexis S. L. Carvalho |
merge with crew-stable
|
file |
diff |
annotate
|
| Fri, 10 Aug 2007 10:46:03 -0700 |
Bryan O'Sullivan |
Make audit_path more stringent.
|
file |
diff |
annotate
|
| Sun, 12 Aug 2007 12:15:10 -0300 |
Alexis S. L. Carvalho |
merge: fix a copy detection bug (issue672)
|
file |
diff |
annotate
|
| Thu, 02 Aug 2007 13:23:53 -0500 |
Matt Mackall |
Merge with -stable
|
file |
diff |
annotate
|
| Thu, 02 Aug 2007 12:29:10 -0500 |
Matt Mackall |
merge: avoid double deletion mentioned in issue636
|
file |
diff |
annotate
|
| Wed, 01 Aug 2007 14:03:48 -0500 |
Matt Mackall |
Merge with stable
|
file |
diff |
annotate
|
| Wed, 01 Aug 2007 12:33:12 -0500 |
Matt Mackall |
merge: do early copy to deal with issue636
|
file |
diff |
annotate
|
| Thu, 26 Jul 2007 12:02:55 -0500 |
Matt Mackall |
Merge with -stable
|
file |
diff |
annotate
|
| Thu, 26 Jul 2007 11:19:53 -0500 |
Matt Mackall |
merge: don't forget to update the dirstate for exec bit changes
|
file |
diff |
annotate
|
| Sat, 21 Jul 2007 16:02:10 -0500 |
Matt Mackall |
Make repo locks recursive, eliminate all passing of lock/wlock
|
file |
diff |
annotate
|
| 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
|