Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:32:14 +0200] rev 574
(0.9.2compat) improve English; from stable
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 09:25:34 -0400] rev 573
keyword: improve English
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 10:34:01 +0200] rev 572
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 571
merge: allow merging going backwards
New behavior is generally superior and more correct, except possibly
with regards to missing files. hg up . is now effectively a no-op,
which is probably the desired behavior for people expecting to move to
tip, but may surprise people who were expecting deleted files to
reappear.
case 1: update to .
a-w -> a-w
classic: ancestor a
missing recreated right?
rmed recreated WRONG
added forgotten WRONG
changed preserved RIGHT
conflicted can't happen
backward merge: ancestor a (NO EFFECT)
missing missing wrong?
rm'ed rm'ed RIGHT
added preserved RIGHT
changed preserved RIGHT
conflicted can't happen
case 2: update to ancestor of .
a-b-w -> b-w
\
a
classic: ancestor a
missing recreated right?
rmed recreated wrong?
added forgotten wrong?
changed preserved RIGHT
conflicted preserved wrong?
backwards merge: ancestor b
missing missing or conflict right?
rm'ed missing or conflict right?
changed preserved RIGHT
conflicted merge RIGHT
added preserved right?
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:25:53 +0200] rev 570
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:25:10 +0200] rev 569
Remove doc string for standalone version
default and stable branches only for development and history.
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:23:23 +0200] rev 568
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 01:24:45 +0200] rev 567
tests: fix doc string in get-with-headers.py
[ original upstream message ]
Gilles Moris <gilles.moris@free.fr> [Thu, 25 Dec 2008 17:49:08 +0100] rev 566
test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py
Note that other sed replacement commands are also filtering get-with-headers.py,
but they seem to be more test specific, hence not handled here.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:18:59 +0200] rev 565
(stable) merge for run-tests.py
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:16:14 +0200] rev 564
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:15:09 +0200] rev 563
(stable) fix import gone wrong in 43d8c042ca20
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:07:29 +0200] rev 562
Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 18:59:18 +0200] rev 561
Refer users to distribution or 0.9.2compat branch
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 18:51:53 +0200] rev 560
(0.9.2compat) document Mercurial version range for standalone extension
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 01:31:03 +0200] rev 559
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 19 Dec 2008 16:47:36 -0600] rev 558
resolve: require -a switch to resolve all files
Like revert -a, this should make this command slightly safer
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Jun 2009 09:16:22 +0200] rev 557
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 14:11:32 -0500] rev 556
commit: drop the now-unused files parameter
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 01 Jun 2009 01:51:50 +0200] rev 555
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 14:55:51 +0200] rev 554
fixed typos found in translatable strings
This is from a spell-check of hg.pot.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Wed, 27 May 2009 20:40:11 +0200] rev 553
(stable) merge with default
Christian Ebert <blacktrash@gmx.net> [Wed, 27 May 2009 20:34:38 +0200] rev 552
keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net> [Tue, 26 May 2009 18:24:06 +0200] rev 551
Merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 550
match: add some default args
[ original upstream message ]
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 549
match: change all users of util.matcher to match.match
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 25 May 2009 20:05:25 +0200] rev 548
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 19 May 2009 03:59:58 +0200] rev 547
update --clean: do not unlink added files (issue575)
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 19 May 2009 05:48:42 +0200] rev 546
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 18 May 2009 17:36:24 -0500] rev 545
commit: move editor outside transaction
The commit editor is now invoked before files and manifest are
committed. The editor is now run with only the wlock held and aborting
an edit no longer requires rolling back a transaction. Changes to
files during a commit still result in undefined behavior.
(This is preliminary work for committing subrepositories)
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 15 May 2009 01:37:50 +0200] rev 544
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 14 May 2009 13:20:40 -0500] rev 543
commit: move commit editor to cmdutil, pass as function
[ original upstream message ]