| Mon, 10 May 2010 11:04:56 -0500 |
David Champion |
merge: tool.check = prompt will force an interactive merge check
|
| Mon, 10 May 2010 11:04:56 -0500 |
David Champion |
merge: introduce tool.check parameter
|
| Wed, 21 Apr 2010 12:02:51 -0500 |
David Champion |
give worst-case 'merge' merge-tool lowest priority
|
| Wed, 21 Apr 2010 11:57:45 -0500 |
David Champion |
merge: tool.premerge=keep will leave premerge markers in $local
|
| Tue, 11 May 2010 20:22:37 +0200 |
Benoit Boissinot |
merge with mpm
|
| Tue, 11 May 2010 20:21:25 +0200 |
Benoit Boissinot |
merge with stable
|
| Tue, 11 May 2010 20:13:52 +0200 |
Benoit Boissinot |
context: fallback function should not return None
stable
|
| Mon, 10 May 2010 22:52:28 +0200 |
Patrick Mezard |
test-subrepo-svn: fix strange svn behaviour on windows
|
| Mon, 10 May 2010 22:46:16 +0200 |
Patrick Mezard |
tests: force color ansi mode on Windows
|
| Mon, 10 May 2010 21:44:00 +0200 |
Patrick Mezard |
acl: improve undefined group error handling
|
| Mon, 10 May 2010 21:15:12 +0200 |
Patrick Mezard |
test-acl: avoid $HGTMP on windows
|
| Mon, 10 May 2010 21:09:48 +0200 |
Patrick Mezard |
acl: grp module is not available on windows
|
| Sun, 09 May 2010 22:51:25 +0200 |
Patrick Mezard |
convert/svn: report path discovery progress
|
| Sun, 09 May 2010 22:50:42 +0200 |
Patrick Mezard |
convert: display files data retrieval progress
|
| Sun, 09 May 2010 22:50:07 +0200 |
Patrick Mezard |
convert: add progress support
|
| Sun, 09 May 2010 21:52:34 +0200 |
Patrick Mezard |
convert: merge sources getmode() into getfile()
|
| Sun, 09 May 2010 21:49:57 +0200 |
Patrick Mezard |
convert/svn: remove useless sort
|
| Sun, 09 May 2010 21:45:00 +0200 |
Patrick Mezard |
convert/svn: list files explicitely, stop checking their type
|
| Sun, 09 May 2010 20:12:45 +0200 |
Patrick Mezard |
acl: clarify acl.sources, fix typo
|
| Sun, 09 May 2010 19:37:16 +0200 |
Patrick Mezard |
convert/svn: remove unused variable
|
| Sun, 09 May 2010 19:25:35 +0200 |
Patrick Mezard |
Merge with crew-stable
|
| Sun, 09 May 2010 19:11:02 +0200 |
Patrick Mezard |
convert/svn: handle files/links replaced by dirs (issue2166)
stable
|
| Sun, 09 May 2010 19:11:02 +0200 |
Patrick Mezard |
convert/svn: do not retrieve removed files
stable
|
| Sun, 09 May 2010 19:11:02 +0200 |
Patrick Mezard |
convert/svn: correctly encode deleted entry paths
stable
|
| Sun, 09 May 2010 19:11:02 +0200 |
Patrick Mezard |
convert/svn: remove broken but unused copy filtering code
stable
|
| Sun, 09 May 2010 19:11:02 +0200 |
Patrick Mezard |
test-convert-svn-move: test moved dirs copy records
stable
|
| Sat, 01 May 2010 16:29:27 +0200 |
Patrick Mezard |
convert/svn: tree conflicts no longer happen now we use memctx
stable
|
| Fri, 07 May 2010 16:59:00 -0500 |
Matt Mackall |
clean up remaining generic exceptions
|
| Fri, 07 May 2010 16:51:45 -0400 |
Eric Eisner |
mq: make use of output labeling for summary
|
| Fri, 07 May 2010 23:31:49 +0200 |
Martin Geisler |
mq: mark error message for translation
|
| Fri, 07 May 2010 23:28:07 +0200 |
Martin Geisler |
mq: mark string for translation
|
| Fri, 07 May 2010 15:19:37 -0500 |
Stanimir Stamenkov |
color: add some missing background colors for win32 console
|
| Fri, 07 May 2010 14:19:14 -0500 |
Matt Mackall |
subrepo: fix 2.5ism in url parsing
|
| Thu, 06 May 2010 15:17:00 -0300 |
Elifarley Callado Coelho Cruz |
acl: update test output
|
| Thu, 06 May 2010 15:14:40 -0300 |
Elifarley Callado Coelho Cruz |
acl: update docstring to describe section [acl.groups]
|
| Thu, 06 May 2010 14:23:14 -0300 |
Elifarley Callado Coelho Cruz |
acl: support for group definitions in section [acl.groups], which take precedence over OS-level groups
|
| Fri, 07 May 2010 14:14:41 -0500 |
Matt Mackall |
subrepo: fix test output
|
| Sat, 01 May 2010 23:05:22 +0200 |
Edouard Gomez |
subrepo: print paths relative to upper repo root for push/pull/commit
|
| Sat, 01 May 2010 23:05:22 +0200 |
Edouard Gomez |
subrepo: print pushing url
|
| Sat, 01 May 2010 23:05:21 +0200 |
Edouard Gomez |
subrepo: dirtiness checks should iterate over subrepos
|
| Sat, 01 May 2010 23:05:19 +0200 |
Edouard Gomez |
subrepo: normalize path part of URLs so that pulling subrepos from webdir works
|
| Fri, 07 May 2010 14:14:41 -0500 |
Matt Mackall |
mq: fix test
|
| Wed, 05 May 2010 20:53:45 -0500 |
Matt Mackall |
mq: add a line to hg summary
|
| Fri, 07 May 2010 14:07:30 -0500 |
Steve Borho |
changectx: change diff() to accept keyword opts
|
| Fri, 07 May 2010 10:59:11 -0500 |
Steve Borho |
changectx: use repo.ui diffopts, allow argument override
|
| Fri, 07 May 2010 17:03:48 +0200 |
Martin Geisler |
Merge with stable
|
| Fri, 07 May 2010 17:03:31 +0200 |
Martin Geisler |
commands: explain that "hg serve" does not do authentication
stable
|
| Fri, 07 May 2010 17:01:14 +0200 |
Martin Geisler |
commands: explain that "hg serve" is mostly for ad-hoc sharing
stable
|
| Wed, 05 May 2010 20:21:57 -0500 |
Matt Mackall |
context: only scan unknowns when needed
|
| Tue, 04 May 2010 15:52:42 -0500 |
Matt Mackall |
context: use asserts for ignored and clean exceptions
|
| Tue, 04 May 2010 15:02:55 -0500 |
Steve Borho |
workingctx: use member variables to store ignored and clean
|
| Tue, 04 May 2010 14:52:25 -0500 |
Steve Borho |
workingctx: add explicit status method, add ignored and fix clean
|
| Tue, 04 May 2010 20:12:58 -0500 |
Steve Borho |
context: add a changectx.diff() convenience function
|
| Wed, 05 May 2010 14:02:45 +0200 |
Christian Ebert |
keyword: omit setting extra variable for record context
|
| Wed, 05 May 2010 09:25:09 +0200 |
Martin Geisler |
acl: more consistent docstring
|
| Wed, 05 May 2010 09:18:05 +0200 |
Martin Geisler |
acl: fix reST syntax
|
| Tue, 04 May 2010 08:39:11 -0300 |
Elifarley Callado Coelho Cruz |
acl: update test output for branch-based access control
|
| Tue, 04 May 2010 08:37:20 -0300 |
Elifarley Callado Coelho Cruz |
acl: add support for branch-based access control
|
| Mon, 03 May 2010 15:28:04 -0700 |
Brendan Cully |
Merge with main
|
| Mon, 03 May 2010 15:27:05 -0700 |
Brendan Cully |
Merge with stable
|
