| Fri, 24 Sep 2010 12:46:54 -0500 |
Matt Mackall |
backout most of 4f8067c94729
|
| Thu, 23 Sep 2010 00:02:31 -0500 |
Brodie Rao |
cleanup: use x in (a, b) instead of x == a or x == b
|
| Mon, 06 Sep 2010 17:35:49 +0200 |
Peter Arrenbrecht |
merge: delay writing the mergestate during until commit is called
|
| Tue, 14 Sep 2010 12:20:51 +0200 |
Adrian Buehlmann |
combine tests
|
| Wed, 25 Aug 2010 16:23:32 +0200 |
Martin Geisler |
util: remove lexists, Python 2.4 introduced os.path.lexists
|
| Sat, 21 Aug 2010 10:48:49 -0500 |
Matt Mackall |
merge with stable
|
| Sat, 21 Aug 2010 10:41:29 -0500 |
Matt Mackall |
merge: move reverse-merge logic out of filemerge (issue2342)
stable
|
| Wed, 11 Aug 2010 20:16:22 +0800 |
Alecs King |
merge: fix typo in docstring
|
| Fri, 06 Aug 2010 12:59:13 -0500 |
Matt Mackall |
Merge with stable
|
| Thu, 05 Aug 2010 16:17:17 -0500 |
Matt Mackall |
merge: drop reference to file contents after write
stable
|
| Sat, 31 Jul 2010 18:12:50 -0500 |
Matt Mackall |
Merge with stable
|
| Fri, 30 Jul 2010 10:32:24 +0300 |
timeless |
progress: use gerund (updating) for merge progress
stable
|
| Tue, 27 Jul 2010 23:40:46 +0900 |
Nicolas Dumazet |
filectx: use cmp(self, fctx) instead of cmp(self, text)
|
| Wed, 30 Jun 2010 23:56:35 -0500 |
Matt Mackall |
subrepo: correctly handle update -C with modified subrepos (issue2022)
stable
|
| Wed, 30 Jun 2010 17:34:20 -0500 |
Matt Mackall |
update: synchronize permissions in the dirstate (issue1473)
stable
|
| Fri, 18 Jun 2010 08:49:24 +0200 |
Peter Arrenbrecht |
merge: pass constant cset ancestor to fctx.ancestor
stable
|
| Sun, 27 Jun 2010 23:12:05 +0200 |
Martin Geisler |
resolve: do not crash on empty mergestate
stable
|
| Sun, 20 Jun 2010 14:21:56 -0500 |
Matt Mackall |
merge: improve merge with ancestor message
|
| Tue, 04 May 2010 09:57:16 +0200 |
Gilles Moris |
merge: avoid to break the dirstate copy status on moved files
|
| Wed, 05 May 2010 20:21:57 -0500 |
Matt Mackall |
context: only scan unknowns when needed
|
| Tue, 20 Apr 2010 11:17:01 +0200 |
Benoit Boissinot |
dirstate: more explicit name, rename normaldirty() to otherparent()
|
| Wed, 17 Feb 2010 15:43:21 +0100 |
Sune Foldager |
run commit and update hooks after command completion (issue1827)
stable
|
| Sun, 07 Feb 2010 17:44:30 -0600 |
Augie Fackler |
update: make calls to ui.progress()
|
| Mon, 25 Jan 2010 00:05:27 -0600 |
Matt Mackall |
many, many trivial check-code fixups
|
| Tue, 19 Jan 2010 22:20:08 -0600 |
Matt Mackall |
Update license to GPLv2+
stable
|
| Sun, 08 Nov 2009 10:29:52 -0600 |
Matt Mackall |
submerge: properly deal with overwrites
|
| Sat, 07 Nov 2009 16:30:42 -0600 |
Matt Mackall |
subrepo: notice dirty subrepo states when merging
|
| Thu, 05 Nov 2009 10:53:59 +0100 |
Stuart W Marks |
update: allow branch crossing without -c or -C, with no uncommitted changes
|
| Thu, 05 Nov 2009 10:53:36 +0100 |
Stuart W Marks |
update: add comments and test cases for updating across branches
|
| Sat, 19 Sep 2009 01:15:38 +0200 |
Martin Geisler |
do not attempt to translate ui.debug output
|
