| 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
|
| Mon, 14 Jan 2008 16:28:32 -0600 |
Matt Mackall |
merge: add a bit more sanity to divergent copy checks
|
file |
diff |
annotate
|
| 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
|
| 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
|