| Wed, 23 Mar 2011 09:20:40 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 22 Mar 2011 12:00:38 -0500 |
Matt Mackall |
merge: avoid unlinking destination of merge when case changes (issue2715)
stable
|
file |
diff |
annotate
|
| Tue, 08 Mar 2011 01:21:50 +0100 |
Mads Kiilerich |
merge: remove last traces of fastforward merging
|
file |
diff |
annotate
|
| Mon, 07 Mar 2011 15:03:10 -0600 |
Matt Mackall |
merge: back out single-parent fast-forward merge
stable
|
file |
diff |
annotate
|
| Sat, 05 Mar 2011 16:34:59 -0600 |
Matt Mackall |
merge: drop resolve state for mergers with identical contents (issue2680)
|
file |
diff |
annotate
|
| Wed, 16 Feb 2011 08:56:11 -0800 |
Oleg Stepanov |
Do not allow merging with uncommitted changes in a subrepo
stable
|
file |
diff |
annotate
|
| Fri, 24 Dec 2010 15:23:01 +0100 |
Dan Villiom Podlaski Christiansen |
explicitly close files
|
file |
diff |
annotate
|
| Mon, 31 Jan 2011 13:38:00 +0100 |
Martin Geisler |
merge with stable
|
file |
diff |
annotate
|
| Mon, 31 Jan 2011 13:33:41 +0100 |
Erik Zielke |
subrepo: make update -C clean the working directory for svn subrepos
stable
|
file |
diff |
annotate
|
| Sun, 02 Jan 2011 19:34:41 +0100 |
Adrian Buehlmann |
rename util.unlink to unlinkpath
|
file |
diff |
annotate
|
| Mon, 13 Dec 2010 11:46:31 -0500 |
Greg Ward |
merge: document some internal return values.
|
file |
diff |
annotate
|
| Tue, 07 Dec 2010 03:29:21 +0100 |
Mads Kiilerich |
merge: fast-forward merge with descendant
|
file |
diff |
annotate
|
| Sun, 10 Oct 2010 09:50:25 -0500 |
Dan Villiom Podlaski Christiansen |
merge: make 'diverging renames' diagnostic a more helpful note.
|
file |
diff |
annotate
|
| Mon, 02 Aug 2010 07:15:47 +0300 |
timeless |
merge/progress: marking strings for localization
|
file |
diff |
annotate
|
| Sat, 09 Oct 2010 17:02:28 -0500 |
Brodie Rao |
update: use higher level wording for "crosses branches" error
|
file |
diff |
annotate
|
| Sat, 09 Oct 2010 14:50:20 -0500 |
Matt Mackall |
merge: handle no file parent in backwards merge (issue2364)
|
file |
diff |
annotate
|
| Fri, 24 Sep 2010 12:46:54 -0500 |
Matt Mackall |
backout most of 4f8067c94729
|
file |
diff |
annotate
|
| Thu, 23 Sep 2010 00:02:31 -0500 |
Brodie Rao |
cleanup: use x in (a, b) instead of x == a or x == b
|
file |
diff |
annotate
|
| Mon, 06 Sep 2010 17:35:49 +0200 |
Peter Arrenbrecht |
merge: delay writing the mergestate during until commit is called
|
file |
diff |
annotate
|
| Tue, 14 Sep 2010 12:20:51 +0200 |
Adrian Buehlmann |
combine tests
|
file |
diff |
annotate
|
| Wed, 25 Aug 2010 16:23:32 +0200 |
Martin Geisler |
util: remove lexists, Python 2.4 introduced os.path.lexists
|
file |
diff |
annotate
|
| Sat, 21 Aug 2010 10:48:49 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sat, 21 Aug 2010 10:41:29 -0500 |
Matt Mackall |
merge: move reverse-merge logic out of filemerge (issue2342)
stable
|
file |
diff |
annotate
|
| Wed, 11 Aug 2010 20:16:22 +0800 |
Alecs King |
merge: fix typo in docstring
|
file |
diff |
annotate
|
| Fri, 06 Aug 2010 12:59:13 -0500 |
Matt Mackall |
Merge with stable
|
file |
diff |
annotate
|
| Thu, 05 Aug 2010 16:17:17 -0500 |
Matt Mackall |
merge: drop reference to file contents after write
stable
|
file |
diff |
annotate
|
| Sat, 31 Jul 2010 18:12:50 -0500 |
Matt Mackall |
Merge with stable
|
file |
diff |
annotate
|
| Fri, 30 Jul 2010 10:32:24 +0300 |
timeless |
progress: use gerund (updating) for merge progress
stable
|
file |
diff |
annotate
|
| Tue, 27 Jul 2010 23:40:46 +0900 |
Nicolas Dumazet |
filectx: use cmp(self, fctx) instead of cmp(self, text)
|
file |
diff |
annotate
|
| Wed, 30 Jun 2010 23:56:35 -0500 |
Matt Mackall |
subrepo: correctly handle update -C with modified subrepos (issue2022)
stable
|
file |
diff |
annotate
|
| Wed, 30 Jun 2010 17:34:20 -0500 |
Matt Mackall |
update: synchronize permissions in the dirstate (issue1473)
stable
|
file |
diff |
annotate
|
| Fri, 18 Jun 2010 08:49:24 +0200 |
Peter Arrenbrecht |
merge: pass constant cset ancestor to fctx.ancestor
stable
|
file |
diff |
annotate
|
| Sun, 27 Jun 2010 23:12:05 +0200 |
Martin Geisler |
resolve: do not crash on empty mergestate
stable
|
file |
diff |
annotate
|
| Sun, 20 Jun 2010 14:21:56 -0500 |
Matt Mackall |
merge: improve merge with ancestor message
|
file |
diff |
annotate
|
| Tue, 04 May 2010 09:57:16 +0200 |
Gilles Moris |
merge: avoid to break the dirstate copy status on moved files
|
file |
diff |
annotate
|
| Wed, 05 May 2010 20:21:57 -0500 |
Matt Mackall |
context: only scan unknowns when needed
|
file |
diff |
annotate
|
| Tue, 20 Apr 2010 11:17:01 +0200 |
Benoit Boissinot |
dirstate: more explicit name, rename normaldirty() to otherparent()
|
file |
diff |
annotate
|
| Wed, 17 Feb 2010 15:43:21 +0100 |
Sune Foldager |
run commit and update hooks after command completion (issue1827)
stable
|
file |
diff |
annotate
|
| Sun, 07 Feb 2010 17:44:30 -0600 |
Augie Fackler |
update: make calls to ui.progress()
|
file |
diff |
annotate
|
| Mon, 25 Jan 2010 00:05:27 -0600 |
Matt Mackall |
many, many trivial check-code fixups
|
file |
diff |
annotate
|
| Tue, 19 Jan 2010 22:20:08 -0600 |
Matt Mackall |
Update license to GPLv2+
stable
|
file |
diff |
annotate
|
| Sun, 08 Nov 2009 10:29:52 -0600 |
Matt Mackall |
submerge: properly deal with overwrites
|
file |
diff |
annotate
|
| Sat, 07 Nov 2009 16:30:42 -0600 |
Matt Mackall |
subrepo: notice dirty subrepo states when merging
|
file |
diff |
annotate
|
| Thu, 05 Nov 2009 10:53:59 +0100 |
Stuart W Marks |
update: allow branch crossing without -c or -C, with no uncommitted changes
|
file |
diff |
annotate
|
| Thu, 05 Nov 2009 10:53:36 +0100 |
Stuart W Marks |
update: add comments and test cases for updating across branches
|
file |
diff |
annotate
|
| Sat, 19 Sep 2009 01:15:38 +0200 |
Martin Geisler |
do not attempt to translate ui.debug output
|
file |
diff |
annotate
|
| Sun, 21 Jun 2009 01:13:19 +0200 |
Simon Heimberg |
ui: extract choice from prompt
|
file |
diff |
annotate
|
| Sun, 05 Jul 2009 11:01:01 +0200 |
Alejandro Santos |
compat: can't compare two values of unequal datatypes
|
file |
diff |
annotate
|
| Mon, 15 Jun 2009 02:45:38 -0500 |
Matt Mackall |
subrepo: add update/merge logic
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: refactor manifestmerge init to better report effective ancestor
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify file revision comparison logic
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: make locally-added file test more correct
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop unused diverge initialization
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: refactor some initialization, drop backwards var
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: combine a copy and move case
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop a flag update case
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: combine three identical 'remote is newer' cases
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop 'remote deleted' case
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify 'other deleted' case
|
file |
diff |
annotate
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify backwards revert test, ready to combine with other cases
|
file |
diff |
annotate
|