mercurial/merge.py
Tue, 12 Aug 2008 17:47:08 +0200 Dirkjan Ochtman merge with crew-stable
Sun, 10 Aug 2008 21:55:06 -0500 Matt Mackall util: set_flags shouldn't know about repo flag formats
Tue, 01 Jul 2008 17:59:31 +0100 Paul Moore Sort removes first when applying updates (fixes issues 750 and 912)
Fri, 27 Jun 2008 18:28:45 -0500 Matt Mackall util: add sort helper
Thu, 26 Jun 2008 14:35:46 -0500 Matt Mackall use repo[changeid] to get a changectx
Thu, 26 Jun 2008 13:58:24 -0500 Matt Mackall rename checkfolding to checkcase
Thu, 26 Jun 2008 13:46:29 -0500 Matt Mackall use repo.changectx(None) to get a workingctx
Sat, 12 Apr 2008 20:51:26 +0200 Patrick Mezard merge: replace readline() call, missing from posixfile_nt
Fri, 11 Apr 2008 12:52:56 -0500 Matt Mackall resolve: new command
Fri, 11 Apr 2008 12:04:26 +0200 Dirkjan Ochtman python-2.6: use sha wrapper from util for new merge code
Thu, 10 Apr 2008 15:02:24 -0500 Matt Mackall merge: introduce mergestate
Sat, 29 Mar 2008 12:39:47 -0500 Matt Mackall copies: skip directory rename checks when not merging
Mon, 24 Mar 2008 20:28:13 +0100 Thomas Arendsen Hein Fix missing space in one of the new update messages.
Mon, 24 Mar 2008 10:01:05 -0500 Matt Mackall update: better logic and messages for updates
Sat, 22 Mar 2008 13:30:08 -0500 Matt Mackall update: no -C needed to switch branches without outstanding changes
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall diff: use copy smarts from copies.py
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall copies: move findcopies code to its own module
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: move symmetricdifferences to ancestor.py
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: simplify some helpers
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: more simplifications to checkcopies
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: simplify checkcopies
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: privatize some functions, unnest some others
Fri, 14 Mar 2008 11:01:31 -0500 Alexis S. L. Carvalho merge: notice uncommited copies (issue1000)
Fri, 14 Mar 2008 09:56:58 -0300 Alexis S. L. Carvalho merge: require --force when there are deleted files
Wed, 12 Mar 2008 15:44:08 -0700 Alexis S. L. Carvalho merge: fix handling of deleted files
Thu, 06 Mar 2008 22:23:26 +0100 Joel Rosdahl Expand import * to allow Pyflakes to find problems
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall filemerge: pull file-merging code into its own module
Mon, 14 Jan 2008 16:28:32 -0600 Matt Mackall merge: add a bit more sanity to divergent copy checks
Thu, 27 Dec 2007 22:47:44 -0600 Matt Mackall merge: add flag merging intelligence
Thu, 27 Dec 2007 22:27:48 -0600 Matt Mackall merge: use util.set_flags
Thu, 27 Dec 2007 22:27:37 -0600 Matt Mackall merge: simplify merge tests, fix exec flag bug
Wed, 26 Dec 2007 23:03:32 +0100 Thomas Arendsen Hein merge with crew-stable
Wed, 26 Dec 2007 22:47:16 +0100 Thomas Arendsen Hein Fix misleading error and prompts during update/merge (issue556)
Sun, 02 Dec 2007 15:15:49 -0600 Matt Mackall update: default to tipmost branch if default branch doesn't exist
Mon, 05 Nov 2007 18:49:35 -0200 Alexis S. L. Carvalho Honour the exec bit when we go back in time.
Tue, 09 Oct 2007 17:25:24 -0500 Matt Mackall Merge with -stable
Mon, 08 Oct 2007 18:47:22 -0500 Matt Mackall findcopies: fix rename bug
Mon, 08 Oct 2007 18:47:22 -0500 Matt Mackall findcopies: fix rename bug
Wed, 03 Oct 2007 23:09:36 +0200 Patrick Mezard merge: provide *_ISLINK environment vars to merge helper
Thu, 04 Oct 2007 19:44:37 -0500 Matt Mackall merge: add debug diagnostics for findcopies
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
Sun, 12 Aug 2007 12:43:52 -0300 Alexis S. L. Carvalho merge with crew-stable
Fri, 10 Aug 2007 10:46:03 -0700 Bryan O'Sullivan Make audit_path more stringent.
Sun, 12 Aug 2007 12:15:10 -0300 Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)
Thu, 02 Aug 2007 13:23:53 -0500 Matt Mackall Merge with -stable
Thu, 02 Aug 2007 12:29:10 -0500 Matt Mackall merge: avoid double deletion mentioned in issue636
Wed, 01 Aug 2007 14:03:48 -0500 Matt Mackall Merge with stable
Wed, 01 Aug 2007 12:33:12 -0500 Matt Mackall merge: do early copy to deal with issue636
Thu, 26 Jul 2007 12:02:55 -0500 Matt Mackall Merge with -stable
Thu, 26 Jul 2007 11:19:53 -0500 Matt Mackall merge: don't forget to update the dirstate for exec bit changes
Sat, 21 Jul 2007 16:02:10 -0500 Matt Mackall Make repo locks recursive, eliminate all passing of lock/wlock
Sat, 21 Jul 2007 16:02:10 -0500 Matt Mackall Use try/finally pattern to cleanup locks and transactions
Sat, 21 Jul 2007 16:02:09 -0500 Matt Mackall dirstate: break update into separate functions
Sun, 15 Jul 2007 14:43:38 -0500 Matt Mackall merge: fix unnecessary rename merges on linear update (issue631)
Thu, 05 Jul 2007 16:01:07 -0500 Matt Mackall merge: fix adding untracked files on directory rename (issue612)
Thu, 05 Jul 2007 13:34:18 -0500 Matt Mackall merge: make test for fast-forward merge stricter (issue619)
Fri, 22 Jun 2007 20:44:40 -0300 Alexis S. L. Carvalho merge: fix small bug with a failed merge across a rename
Thu, 21 Jun 2007 18:02:03 -0500 Matt Mackall merge: warn user about divergent renames
Tue, 19 Jun 2007 08:51:34 +0200 Thomas Arendsen Hein Updated copyright notices and add "and others" to "hg version"
Tue, 19 Jun 2007 08:06:37 +0200 Thomas Arendsen Hein Cleanup of whitespace, indentation and line continuation.
less more (0) -100 -60 tip