| Sat, 09 Feb 2013 15:22:08 -0800 |
Bryan O'Sullivan |
merge: handle subrepo merges and .hgsubstate specially
|
| Sat, 09 Feb 2013 15:21:58 -0800 |
Bryan O'Sullivan |
merge: split out mostly-non-interactive working dir updates
|
| Sat, 09 Feb 2013 21:24:36 +0000 |
Bryan O'Sullivan |
merge: don't call copies.mergecopies unless we need to
|
| Sat, 09 Feb 2013 21:24:24 +0000 |
Bryan O'Sullivan |
merge: rename p1 to wctx in manifestmerge
|
| Sat, 09 Feb 2013 15:36:00 +0000 |
Siddharth Agarwal |
manifestmerge: handle abort on local unknown, remote created files
|
| Fri, 08 Feb 2013 15:23:23 +0000 |
Siddharth Agarwal |
manifestmerge: pass in branchmerge and force separately
|
| Mon, 04 Feb 2013 02:46:53 +0100 |
Mads Kiilerich |
merge: inline act()
|
| Mon, 04 Feb 2013 02:46:53 +0100 |
Mads Kiilerich |
merge: don't indent "local changed %s which remote deleted" prompt
|
| Mon, 04 Feb 2013 02:46:38 +0100 |
Mads Kiilerich |
merge: backout manifest sorting and workarounds for cost of it
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay debug messages for merge actions
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: make all action tuples have the same length - keep args as tuple
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay prompts a bit and show them in (extra) sorted order
|
| Wed, 30 Jan 2013 19:29:36 +0100 |
Mads Kiilerich |
merge: fix UnboundLocalError (issue3791)
stable
|
| Sun, 20 Jan 2013 17:18:00 -0600 |
Matt Mackall |
merge: only sort manifests in debug mode (issue3769)
stable
|
| Wed, 12 Dec 2012 02:38:14 +0100 |
Mads Kiilerich |
subrepos: process subrepos in sorted order
|
| Tue, 15 Jan 2013 02:59:12 +0100 |
Mads Kiilerich |
merge: process files in sorted order
|
| Tue, 15 Jan 2013 01:05:12 +0100 |
Mads Kiilerich |
merge: remove "case" comments
|
| Wed, 09 Jan 2013 02:02:45 +0100 |
Mads Kiilerich |
merge: merge file flags together with file content
|
| Thu, 10 Jan 2013 03:40:45 +0100 |
Mads Kiilerich |
merge: remove old pre-audit code checking for absolute paths
|
| Thu, 10 Jan 2013 00:45:51 +0100 |
Mads Kiilerich |
merge: drop reference to file contents immediately after write
|
| Thu, 10 Jan 2013 00:44:23 +0100 |
Mads Kiilerich |
merge: changing the mode of a file is also an update
|
| Tue, 15 Jan 2013 01:05:12 +0100 |
Mads Kiilerich |
merge: use util.unlinkpath for removing moved files
|
| Tue, 15 Jan 2013 01:05:12 +0100 |
Mads Kiilerich |
merge: .hgsubstate is special as merge destination, not as merge source
|
| Wed, 09 Jan 2013 00:01:33 +0100 |
Mads Kiilerich |
merge: remove redundant unlink after merge
|
| Wed, 09 Jan 2013 00:01:33 +0100 |
Mads Kiilerich |
merge: rename list of actions from action to actions
|
| Wed, 09 Jan 2013 00:01:33 +0100 |
Mads Kiilerich |
merge: consistently use "x" instead of 'x' for internal action types
|
| Wed, 09 Jan 2013 00:01:33 +0100 |
Mads Kiilerich |
merge: consistently use repo.wopener.audit instead of creating a new auditor
|
| Fri, 28 Dec 2012 11:55:57 +0100 |
Mads Kiilerich |
util: fold ENOENT check into unlinkpath, controlled by new ignoremissing flag
|
| Wed, 26 Dec 2012 14:50:17 -0800 |
Siddharth Agarwal |
copies: separate moves via directory renames from explicit copies
|
| Thu, 06 Dec 2012 22:07:44 -0600 |
Kevin Bullock |
merge: fix mistake in moved _checkcollision call from 5881d5b7552f
|
| Tue, 04 Dec 2012 12:54:18 -0800 |
David Schleimer |
merge: support calculating merge actions against non-working contexts
|
| Tue, 04 Dec 2012 12:54:18 -0800 |
David Schleimer |
merge: refactor action calculation into function
|
| Wed, 31 Oct 2012 16:50:22 +0900 |
FUJIWARA Katsunori |
icasefs: make case-folding collision detection as deletion aware (issue3648)
stable
|
| Wed, 23 May 2012 20:50:16 +0200 |
Thomas Arendsen Hein |
merge: warn about file deleted in one branch and renamed in other (issue3074)
|
| Sun, 13 May 2012 14:04:04 +0200 |
Brodie Rao |
localrepo: add branchtip() method for faster single-branch lookups
|
| Thu, 03 May 2012 15:14:58 +0200 |
Patrick Mezard |
rebase: allow collapsing branches in place (issue3111)
|
| Sat, 12 May 2012 15:54:54 +0200 |
Brodie Rao |
cleanup: eradicate long lines
|
| Sun, 29 Apr 2012 22:25:55 +0200 |
Patrick Mezard |
localrepo: add setparents() to adjust dirstate copies (issue3407)
stable
|
| Fri, 27 Apr 2012 13:18:09 -0500 |
Matt Mackall |
merge: check for untracked files more precisely (issue3400)
stable
|
| Mon, 23 Apr 2012 14:32:59 +0200 |
Patrick Mezard |
update: fix case-collision with a clean wd and no --clean
stable
|
| Mon, 16 Apr 2012 01:11:29 +0900 |
FUJIWARA Katsunori |
icasefs: make case-folding collision detection as rename aware (issue3370)
stable
|
| Mon, 26 Mar 2012 16:41:54 -0500 |
Matt Mackall |
merge: fix unknown file merge detection for case-folding systems
|
| Thu, 15 Mar 2012 13:11:42 -0500 |
Matt Mackall |
merge with stable
|
| Wed, 14 Mar 2012 14:45:41 -0500 |
Matt Mackall |
merge: accept missing revisions in symlink flag merge (issue3316)
stable
|
| Tue, 13 Mar 2012 16:29:13 -0500 |
Matt Mackall |
merge with stable
|
| Tue, 13 Mar 2012 16:28:08 -0500 |
Matt Mackall |
merge: handle linear update to symlink correctly (issue3316)
stable
|
| Sat, 25 Feb 2012 14:22:58 -0600 |
Matt Mackall |
copies: remove checkdirs options
|
| Thu, 09 Feb 2012 17:54:47 -0600 |
Matt Mackall |
update: just merge unknown file collisions
|
| Thu, 09 Feb 2012 17:04:17 -0600 |
Matt Mackall |
merge: don't use unknown()
|
| Thu, 09 Feb 2012 16:50:19 -0600 |
Matt Mackall |
merge: refactor unknown file conflict checking
|
| Thu, 09 Feb 2012 13:16:20 -0600 |
Matt Mackall |
update: use normal update path with --check (issue2450)
|
| Thu, 26 Jan 2012 20:34:57 -0600 |
Matt Mackall |
merge: defer symlink flag merging to filemerge (issue3200)
stable
|
| Wed, 11 Jan 2012 15:53:42 -0500 |
Jordi Gutiérrez Hermoso |
merge: report all files in _checkunknown
|
| Wed, 04 Jan 2012 15:48:02 -0600 |
Matt Mackall |
copies: split the copies api for "normal" and merge cases (API)
|
| Fri, 16 Dec 2011 19:05:59 -0600 |
Matt Mackall |
merge with stable
|
| Fri, 16 Dec 2011 21:21:27 +0900 |
FUJIWARA Katsunori |
merge: check filename case collision between changesets for branch merging
stable
|
| Thu, 15 Dec 2011 14:37:36 -0600 |
Matt Mackall |
merge with stable
|
| Mon, 12 Dec 2011 17:10:19 +0900 |
FUJIWARA Katsunori |
icasefs: use util.normcase() instead of str.lower() or os.path.normpath()
stable
|
| Fri, 09 Dec 2011 17:34:53 +0100 |
Martin Geisler |
merge: make debug output easier to read
|
| Wed, 07 Dec 2011 11:23:01 -0600 |
Kevin Bullock |
merge: make 'nothing to merge' aborts consistent
|
| Sun, 20 Nov 2011 23:09:32 +0100 |
Mads Kiilerich |
update: don't clobber untracked files with wrong casing
stable
|
| Wed, 17 Aug 2011 14:11:46 +0200 |
Martin Geisler |
merge: use repo.ui directly instead local variable
|
| Thu, 28 Jul 2011 14:36:07 +0900 |
FUJIWARA Katsunori |
i18n: use UTF-8 string to lower filename for case collision check
stable
|
| Fri, 17 Jun 2011 15:21:02 -0500 |
Augie Fackler |
update: check wc.dirty() before setting overwrite=True
|
| Tue, 31 May 2011 11:52:22 -0700 |
Brendan Cully |
Make pull -u behave like pull && update
|
| Thu, 26 May 2011 17:15:35 -0500 |
Matt Mackall |
dirstate: rename forget to drop
|
| Sun, 22 May 2011 11:03:15 +0200 |
Adrian Buehlmann |
applyupdates: audit merged files
|
| Sat, 21 May 2011 23:21:12 +0200 |
Adrian Buehlmann |
applyupdates: audit path on flag changes
|
| Sat, 21 May 2011 02:05:00 +0200 |
Adrian Buehlmann |
applyupdates: audit unlinking of renamed files and directories
|
| Fri, 06 May 2011 15:22:31 +0200 |
Adrian Buehlmann |
rename util.set_flags to setflags
|
| Fri, 06 May 2011 09:54:06 +0200 |
Adrian Buehlmann |
rename path_auditor to pathauditor
|
| Mon, 02 May 2011 10:11:18 +0200 |
Dan Villiom Podlaski Christiansen |
prevent transient leaks of file handle by using new helper functions
|
| Sat, 30 Apr 2011 13:59:14 +0200 |
Alexander Solovyov |
remove unused imports and variables
|
| Wed, 20 Apr 2011 22:43:31 +0200 |
Adrian Buehlmann |
move path_auditor from util to scmutil
|
| Mon, 04 Apr 2011 16:21:59 -0500 |
Matt Mackall |
misc: replace .parents()[0] with p1()
|
| Mon, 04 Apr 2011 15:25:20 -0500 |
Matt Mackall |
merge: add ancestor to the update function
|
| Wed, 23 Mar 2011 09:20:40 -0500 |
Matt Mackall |
merge with stable
|
| Tue, 22 Mar 2011 12:00:38 -0500 |
Matt Mackall |
merge: avoid unlinking destination of merge when case changes (issue2715)
stable
|
| Tue, 08 Mar 2011 01:21:50 +0100 |
Mads Kiilerich |
merge: remove last traces of fastforward merging
|
| Mon, 07 Mar 2011 15:03:10 -0600 |
Matt Mackall |
merge: back out single-parent fast-forward merge
stable
|
| Sat, 05 Mar 2011 16:34:59 -0600 |
Matt Mackall |
merge: drop resolve state for mergers with identical contents (issue2680)
|
| Wed, 16 Feb 2011 08:56:11 -0800 |
Oleg Stepanov |
Do not allow merging with uncommitted changes in a subrepo
stable
|
| Fri, 24 Dec 2010 15:23:01 +0100 |
Dan Villiom Podlaski Christiansen |
explicitly close files
|
| Mon, 31 Jan 2011 13:38:00 +0100 |
Martin Geisler |
merge with stable
|
| Mon, 31 Jan 2011 13:33:41 +0100 |
Erik Zielke |
subrepo: make update -C clean the working directory for svn subrepos
stable
|
| Sun, 02 Jan 2011 19:34:41 +0100 |
Adrian Buehlmann |
rename util.unlink to unlinkpath
|
| Mon, 13 Dec 2010 11:46:31 -0500 |
Greg Ward |
merge: document some internal return values.
|
| Tue, 07 Dec 2010 03:29:21 +0100 |
Mads Kiilerich |
merge: fast-forward merge with descendant
|
| Sun, 10 Oct 2010 09:50:25 -0500 |
Dan Villiom Podlaski Christiansen |
merge: make 'diverging renames' diagnostic a more helpful note.
|
| Mon, 02 Aug 2010 07:15:47 +0300 |
timeless |
merge/progress: marking strings for localization
|
| Sat, 09 Oct 2010 17:02:28 -0500 |
Brodie Rao |
update: use higher level wording for "crosses branches" error
|
| Sat, 09 Oct 2010 14:50:20 -0500 |
Matt Mackall |
merge: handle no file parent in backwards merge (issue2364)
|
| 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
|
| Sun, 21 Jun 2009 01:13:19 +0200 |
Simon Heimberg |
ui: extract choice from prompt
|
| Sun, 05 Jul 2009 11:01:01 +0200 |
Alejandro Santos |
compat: can't compare two values of unequal datatypes
|
| Mon, 15 Jun 2009 02:45:38 -0500 |
Matt Mackall |
subrepo: add update/merge logic
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: refactor manifestmerge init to better report effective ancestor
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify file revision comparison logic
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: make locally-added file test more correct
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop unused diverge initialization
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: refactor some initialization, drop backwards var
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: combine a copy and move case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop a flag update case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: combine three identical 'remote is newer' cases
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop 'remote deleted' case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify 'other deleted' case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify backwards revert test, ready to combine with other cases
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: allow merging going backwards
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: reorder remote creation tests
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop recreating case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop an overwrite test
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify a delete case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: reorder get cases for future simplification
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: fix prompt keep
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: remove a flags case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: pretend ancestor is local to simplify backwards and overwrite
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify flag merging code slightly
|
| Fri, 22 May 2009 11:42:21 -0500 |
Steve Borho |
merge: give hint as to how to discover uncommitted changes
|
| Tue, 19 May 2009 03:59:58 +0200 |
Benoit Boissinot |
update --clean: do not unlink added files (issue575)
|
| Wed, 13 May 2009 14:08:39 +0200 |
Dirkjan Ochtman |
some modernization cleanups, forward compatibility
|
| Tue, 28 Apr 2009 17:40:46 +0200 |
Simon Heimberg |
separate import lines from mercurial and general python modules
|
| Thu, 30 Apr 2009 10:15:32 -0500 |
Steve Borho |
ui: replace regexp pattern with sequence of choices
|
| Sun, 26 Apr 2009 01:08:54 +0200 |
Martin Geisler |
updated license to be explicit about GPL version 2
|
| Wed, 22 Apr 2009 00:57:28 +0200 |
Martin Geisler |
replace set-like dictionaries with real sets
|
| Wed, 22 Apr 2009 02:01:22 +0200 |
Ronny Pfannschmidt |
switch lock releasing in the core from gc to explicit
|
| Mon, 16 Mar 2009 16:58:41 -0500 |
Matt Mackall |
resolve: move reset to localrepo.commit
|
| Sun, 15 Feb 2009 10:50:48 -0600 |
Matt Mackall |
merge: mark kept local files as readded on linear update (issue539)
|
| Tue, 13 Jan 2009 23:17:19 +0100 |
Patrick Mezard |
Merge with crew-stable
|
| Tue, 13 Jan 2009 22:41:06 +0100 |
Patrick Mezard |
merge: fix execute bit update issue introduced by 89207edf3973
|
| Mon, 12 Jan 2009 09:16:03 +0100 |
Dirkjan Ochtman |
use dict.iteritems() rather than dict.items()
|
| Wed, 07 Jan 2009 02:11:17 +0100 |
Benoit Boissinot |
correctly update dirstate after update+mode change (issue1456)
|
| Wed, 08 Oct 2008 16:22:08 -0500 |
Matt Mackall |
merge: fix bug going backwards for already reverted files (issue1303)
|
| Sun, 31 Aug 2008 16:12:02 +0200 |
Martin Geisler |
i18n: mark strings for translation in Mercurial
|
| 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.
|
| Mon, 18 Jun 2007 12:38:54 -0700 |
Brendan Cully |
Make fast-forward merges full merges
|
| Tue, 08 May 2007 11:42:48 -0500 |
Matt Mackall |
Merge with stable
|
| Tue, 08 May 2007 02:59:13 -0500 |
Matt Mackall |
merge: fix spurious merges for copies in linear updates
|
| Sun, 06 May 2007 20:27:45 -0700 |
Brendan Cully |
Add fast-forward branch merging
|
| Thu, 03 May 2007 17:27:21 -0500 |
Matt Mackall |
Merge with stable
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: reorganize some hunks in findcopies
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: simplify a check in checkcopies
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: expand and simplify the invalid handling for directory moves
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: fix a bug detecting directory moves
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: clarify the findcopies code
|
| Mon, 16 Apr 2007 12:37:30 -0500 |
Matt Mackall |
Merge with stable
|
| Mon, 16 Apr 2007 12:24:52 -0500 |
Matt Mackall |
merge: fix quadratic behavior in find-copies
|
| Thu, 05 Apr 2007 17:09:31 -0500 |
Matt Mackall |
Merge with stable
|
| Thu, 05 Apr 2007 16:43:18 -0500 |
Matt Mackall |
merge: fix a bug where copies were ignored
|
| Thu, 05 Apr 2007 16:25:47 -0500 |
Matt Mackall |
merge: fix a bug where copies were getting ignored
|
| Fri, 16 Mar 2007 00:45:18 -0300 |
Alexis S. L. Carvalho |
Merge with crew-stable
|
| Wed, 14 Mar 2007 01:26:09 -0500 |
Matt Mackall |
Merge with -stable, fix small test failure
|
| Sat, 10 Mar 2007 17:45:32 -0800 |
Brendan Cully |
Merge with crew-stable
|
| Tue, 13 Mar 2007 18:50:02 -0500 |
Matt Mackall |
Move branch read/write to dirstate where it belongs
|
| Tue, 27 Feb 2007 16:47:16 -0600 |
Matt Mackall |
Merge with stable
|
| Tue, 27 Feb 2007 16:20:06 -0600 |
Matt Mackall |
merge: fix renaming of subdirectories under renamed directories
|
| Fri, 29 Dec 2006 20:04:31 -0600 |
Matt Mackall |
symlinks: minimal support for symlinks in merge/update
|
| Fri, 29 Dec 2006 20:04:31 -0600 |
Matt Mackall |
symlinks: add flags param to wwrite
|
| Fri, 29 Dec 2006 20:04:31 -0600 |
Matt Mackall |
replace filehandle version of wwrite with wwritedata
|
| Thu, 14 Dec 2006 20:25:19 -0600 |
Matt Mackall |
Simplify i18n imports
|
| Wed, 13 Dec 2006 13:27:09 -0600 |
Matt Mackall |
Replace demandload with new demandimport
|
| Tue, 12 Dec 2006 18:16:23 -0600 |
Matt Mackall |
Remove deprecated old-style branch support
|
| Tue, 12 Dec 2006 17:52:33 -0600 |
Matt Mackall |
Fix copy detection corner case
|
| Sun, 10 Dec 2006 20:35:28 -0200 |
Alexis S. L. Carvalho |
Use UTF-8 in .hg/branch
|
| Mon, 04 Dec 2006 17:10:31 -0600 |
Matt Mackall |
imported patch collision
|
| Sun, 03 Dec 2006 16:16:33 -0600 |
Matt Mackall |
Handle transcoding of branch names
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: handle directory renames
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: move check for empty ancestor into findcopies
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: only store one direction of copies in the copy map
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: add copied hash to simplify copy logic
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: remove unused match logic from findcopies
|
| Thu, 30 Nov 2006 17:36:33 -0600 |
Matt Mackall |
merge: report destinations of moves in merge action messages
|
| Mon, 27 Nov 2006 15:27:09 -0800 |
Brendan Cully |
Make context __eq__ handle arbitrary RHS values
|
| Thu, 23 Nov 2006 22:45:00 -0800 |
Brendan Cully |
merge: Don't search for copies across unrelated manifests
|
| Sat, 18 Nov 2006 11:34:19 -0600 |
Matt Mackall |
avoid unnecessary copy merges
|
| Fri, 17 Nov 2006 08:06:54 +0100 |
Thomas Arendsen Hein |
white space and line break cleanups
|
| Wed, 01 Nov 2006 21:47:55 -0600 |
Matt Mackall |
Clarify untracked file merge message
|
| Tue, 31 Oct 2006 13:03:23 +0100 |
Benoit Boissinot |
merge with backout
|
| Tue, 31 Oct 2006 13:02:49 +0100 |
Benoit Boissinot |
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
|
| Sun, 29 Oct 2006 14:18:55 +0100 |
Benoit Boissinot |
use workingcontext.files() to detect if the repo is unclean
|
| Sun, 29 Oct 2006 13:08:10 +0100 |
Benoit Boissinot |
allow update to switch to a different branch if the repo is clean
|
| Sun, 29 Oct 2006 10:53:51 +0100 |
Thomas Arendsen Hein |
Define and use nullrev (revision of nullid) instead of -1.
|
| Tue, 17 Oct 2006 22:59:01 -0500 |
Matt Mackall |
merge: fix branch setting
|
| Tue, 17 Oct 2006 22:34:43 -0500 |
Matt Mackall |
imported patch foo
|
| Sun, 15 Oct 2006 16:18:09 -0500 |
Matt Mackall |
merge: if filemerge skips merge, report as updated
|
| Fri, 13 Oct 2006 17:58:04 -0500 |
Matt Mackall |
merge: update dirstate correctly for non-branchmerge updates
|
| Thu, 12 Oct 2006 14:49:19 -0500 |
Matt Mackall |
merge: turn followcopies on by default
|
| Tue, 10 Oct 2006 03:39:44 -0500 |
Matt Mackall |
merge: pull user messages out to hg.py
|
| Tue, 10 Oct 2006 02:31:02 -0500 |
Matt Mackall |
merge: update some docstrings
|
| Tue, 10 Oct 2006 02:15:20 -0500 |
Matt Mackall |
merge: various tidying
|
| Tue, 10 Oct 2006 01:43:58 -0500 |
Matt Mackall |
merge: use contexts in checkunknown and forgetremoved
|
| Tue, 10 Oct 2006 01:16:06 -0500 |
Matt Mackall |
merge: shortcircuit filemerge for identical files
|
| Tue, 10 Oct 2006 00:54:00 -0500 |
Matt Mackall |
merge: pull file copy/move out of filemerge
|
| Tue, 10 Oct 2006 00:41:55 -0500 |
Matt Mackall |
merge: unify merge and copy actions
|
| Tue, 10 Oct 2006 00:32:30 -0500 |
Matt Mackall |
merge: swap file and mode args for act()
|
| Tue, 10 Oct 2006 00:22:03 -0500 |
Matt Mackall |
merge: finish removing nodes from action list
|
| Mon, 09 Oct 2006 23:23:25 -0500 |
Matt Mackall |
merge: eliminate nodes from action list
|
| Mon, 09 Oct 2006 21:27:04 -0500 |
Matt Mackall |
filemerge: use contexts rather than my and other
|
| Mon, 09 Oct 2006 20:32:03 -0500 |
Matt Mackall |
merge: pass contexts to applyupdates
|
| Mon, 09 Oct 2006 18:13:38 -0500 |
Matt Mackall |
merge: don't call hooks for revert
|
| Mon, 09 Oct 2006 16:07:19 -0500 |
Matt Mackall |
merge: use contexts for manifestmerge
|
| Sun, 08 Oct 2006 19:57:45 -0500 |
Matt Mackall |
merge: remember rename copies and parents properly on commit
|
| Fri, 06 Oct 2006 16:55:11 -0500 |
Matt Mackall |
merge: copy fixes and tests
|
| Wed, 04 Oct 2006 19:08:04 -0500 |
Matt Mackall |
merge: fixes for merge+rename
|
| Wed, 04 Oct 2006 15:43:27 -0500 |
Matt Mackall |
merge: add rename following
|
| Wed, 04 Oct 2006 14:33:22 -0500 |
Matt Mackall |
merge: reduce manifest copying
|
| Wed, 04 Oct 2006 14:09:26 -0500 |
Matt Mackall |
merge: reorder dirstate update slightly for correctness
|
| Tue, 03 Oct 2006 01:21:46 -0500 |
Matt Mackall |
merge: use new working context object in update
|
| Mon, 02 Oct 2006 12:06:33 -0500 |
Matt Mackall |
merge: remove old merge function
|
| Mon, 02 Oct 2006 12:04:48 -0500 |
Matt Mackall |
merge: extend file merge function for renames
|
| Fri, 29 Sep 2006 17:50:59 -0500 |
Matt Mackall |
merge: minor nullid cleanup
|
| Fri, 29 Sep 2006 16:39:38 -0500 |
Matt Mackall |
merge: use repo.parents and parent contexts in update
|
| Tue, 26 Sep 2006 16:21:52 -0500 |
Matt Mackall |
merge: move partial filtering out of manifest merge
|
| Tue, 26 Sep 2006 16:04:07 -0500 |
Matt Mackall |
merge: move findcopies after workingmanifest
|
| Tue, 26 Sep 2006 15:58:51 -0500 |
Matt Mackall |
findcopies: shortcut for empty working dir
|
| Mon, 25 Sep 2006 20:31:05 -0500 |
Matt Mackall |
findcopies: use dirstate rename information
|
| Mon, 25 Sep 2006 16:45:31 -0500 |
Matt Mackall |
Add core copy detection algorithm
|
| Sun, 17 Sep 2006 21:27:30 -0500 |
Matt Mackall |
merge: simplify actions with helper function
|
| Sun, 17 Sep 2006 21:11:26 -0500 |
Matt Mackall |
merge: simplify local created logic
|
| Sun, 17 Sep 2006 20:43:06 -0500 |
Matt Mackall |
merge: simplify prompt code
|
| Sun, 17 Sep 2006 20:38:02 -0500 |
Matt Mackall |
merge: simplify exec flag handling
|
| Sun, 17 Sep 2006 20:18:27 -0500 |
Matt Mackall |
merge: simplify tests for local changed/remote deleted
|
| Sun, 17 Sep 2006 20:10:54 -0500 |
Matt Mackall |
merge: more simplification of m2 manifest scanning
|
| Sun, 17 Sep 2006 20:00:14 -0500 |
Matt Mackall |
merge: reorder tests on m2 items in manifestmerge
|
| Sun, 17 Sep 2006 19:54:01 -0500 |
Matt Mackall |
merge: eliminate redundant security check
|
| Sun, 17 Sep 2006 19:53:19 -0500 |
Matt Mackall |
merge: eliminate confusing queued variable
|
| Sun, 17 Sep 2006 18:28:50 -0500 |
Matt Mackall |
merge: remove no longer possible clause
|
| Sun, 17 Sep 2006 17:39:19 -0500 |
Matt Mackall |
merge: move apply and dirstate code into separate functions
|
| Sun, 17 Sep 2006 17:13:02 -0500 |
Matt Mackall |
merge: remove linear variable
|
| Sun, 17 Sep 2006 17:07:44 -0500 |
Matt Mackall |
merge: simplify hook code
|
| Sun, 17 Sep 2006 16:50:17 -0500 |
Matt Mackall |
merge: linear_path -> linear
|
| Sun, 17 Sep 2006 16:47:33 -0500 |
Matt Mackall |
merge: pull manifest checks and updates into separate functions
|
| Sun, 17 Sep 2006 16:13:34 -0500 |
Matt Mackall |
merge: remove now unused umap dict
|
| Sun, 17 Sep 2006 16:13:03 -0500 |
Matt Mackall |
merge: pull manifest comparison out into separate function
|
| Sun, 17 Sep 2006 16:02:09 -0500 |
Matt Mackall |
Merge with mainline
|
| Sun, 17 Sep 2006 15:59:59 -0500 |
Matt Mackall |
merge: move set_exec to actions
|
| Sun, 17 Sep 2006 15:54:51 -0500 |
Matt Mackall |
merge: add forget to action list
|
| Sun, 17 Sep 2006 15:24:00 -0500 |
Matt Mackall |
merge: add codes to action list, eliminate None elements
|
| Sun, 17 Sep 2006 15:10:56 -0500 |
Matt Mackall |
merge: convert actions to list
|
| Fri, 15 Sep 2006 15:22:45 -0500 |
Matt Mackall |
Merge with crew
|
| Sat, 26 Aug 2006 11:19:00 +0200 |
Benoit Boissinot |
fix errors reported by pychecker
|
| Tue, 22 Aug 2006 21:02:25 -0500 |
Matt Mackall |
merge: fold umap and added into m1 manifest
|
| Tue, 22 Aug 2006 19:39:54 -0500 |
Matt Mackall |
merge: make unresolved a counter
|
| Tue, 22 Aug 2006 19:32:16 -0500 |
Matt Mackall |
merge: use context code to retrieve manifests
|
| Tue, 22 Aug 2006 19:12:09 -0500 |
Matt Mackall |
merge: add remove to the action hash
|
| Tue, 22 Aug 2006 18:06:17 -0500 |
Matt Mackall |
merge: combine merge and get lists
|
| Tue, 22 Aug 2006 17:42:55 -0500 |
Matt Mackall |
merge: remove redundant if
|
| Tue, 22 Aug 2006 17:26:44 -0500 |
Matt Mackall |
merge: eliminate mw manifestdict, do everything with m1
|
| Tue, 22 Aug 2006 17:20:09 -0500 |
Matt Mackall |
merge: eliminate usage of m1 after working manifest creation
|
| Tue, 22 Aug 2006 17:08:38 -0500 |
Matt Mackall |
merge: simplify working dir manifest generation
|
| Tue, 22 Aug 2006 16:47:27 -0500 |
Matt Mackall |
merge: simplify some update logic
|
| Tue, 22 Aug 2006 16:23:29 -0500 |
Matt Mackall |
merge: hoist partial code out of manifest loops
|
| Tue, 22 Aug 2006 16:12:54 -0500 |
Matt Mackall |
merge: minor simplification
|
| Mon, 21 Aug 2006 14:25:56 -0500 |
Matt Mackall |
merge: rename mysterious variable
|
| Mon, 21 Aug 2006 14:21:42 -0500 |
Matt Mackall |
merge: add backwards variable
|
| Tue, 15 Aug 2006 23:17:06 -0500 |
Matt Mackall |
merge: consolidate dirstate updates
|
| Tue, 15 Aug 2006 22:46:35 -0500 |
Matt Mackall |
merge: use file size stored in revlog index
|
| Tue, 15 Aug 2006 18:30:21 -0500 |
Matt Mackall |
merge: move forgets to the apply stage
|
| Tue, 15 Aug 2006 18:12:36 -0500 |
Matt Mackall |
trivial bool() cleanup
|
| Tue, 15 Aug 2006 16:27:19 -0500 |
Matt Mackall |
merge: hoist some working manifest logic out of merge loop
|
| Tue, 15 Aug 2006 16:12:51 -0500 |
Matt Mackall |
merge: working manifest new/changed
|
| Tue, 15 Aug 2006 15:58:10 -0500 |
Matt Mackall |
merge: factor out exec bit merge function
|
| Tue, 15 Aug 2006 15:45:45 -0500 |
Matt Mackall |
Use revlog hash comparison technique in merge
|
| Mon, 14 Aug 2006 14:42:15 -0500 |
Matt Mackall |
Merge with crew
|
| Sat, 12 Aug 2006 16:40:12 -0700 |
Vadim Gelfer |
remove localrepository.changes.
|
| Mon, 14 Aug 2006 14:14:08 -0500 |
Matt Mackall |
merge: minor simplification
|
| Wed, 09 Aug 2006 22:07:13 -0500 |
Matt Mackall |
Merge: use single objects for tracking manifests
|
| Wed, 09 Aug 2006 17:11:01 -0500 |
Matt Mackall |
Merge: save away mode bit so that we don't need manifest later
|
| Wed, 09 Aug 2006 15:03:46 -0500 |
Matt Mackall |
Merge manifest refactor work
|
| Tue, 08 Aug 2006 10:56:48 -0500 |
Matt Mackall |
Merge: combine force and forcemerge arguments
|
| Tue, 08 Aug 2006 10:35:19 -0500 |
Matt Mackall |
Merge: move most tests to the beginning
|
| Tue, 08 Aug 2006 09:26:00 -0500 |
Matt Mackall |
Merge: refactor err and failedmerge -> unresolved
|
| Tue, 08 Aug 2006 09:19:20 -0500 |
Matt Mackall |
Refactor update locking slightly
|
| Tue, 08 Aug 2006 09:11:16 -0500 |
Matt Mackall |
Merge: combine choose and moddirstate to partial
|
| Mon, 07 Aug 2006 23:53:04 -0500 |
Matt Mackall |
Rename merge.allow -> merge.branchmerge
|
| Mon, 07 Aug 2006 16:47:06 -0500 |
Matt Mackall |
Merge with crew
|
| Thu, 03 Aug 2006 15:24:41 -0500 |
Matt Mackall |
Move merge code to its own module
|
