Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 00:30:09 +0100] rev 12684
keyword: fix weeding of expansion candidates when recording
Rearrange tests to check this, i.e. that there are changes
in other files, not only the recorded one.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 10 Oct 2010 09:48:37 -0500] rev 12683
copies: don't detect copies as "divergent renames"
(For the purposes of this patch copy is defined as a rename where the
source continues to exist.)
Augie Fackler <durin42@gmail.com> [Sat, 09 Oct 2010 11:02:11 -0500] rev 12682
strip: add --keep flag to avoid modifying wc during strip
Fixes issue1564.
Brodie Rao <brodie@bitheap.org> [Sat, 09 Oct 2010 17:02:28 -0500] rev 12681
update: use higher level wording for "crosses branches" error
When using "hg update" to update to a revision on another branch, if
the user has uncommitted changes in the working directory, hg aborts
with the following message:
abort: crosses branches (use 'hg merge' to merge or use 'hg update
-C' to discard changes)
If the user isn't trying to update to tip and they follow the command
examples verbatim, they would end up updating to the wrong revision.
This patch removes the command examples in favor of just telling the
user to either merge or use --clean:
abort: crosses branches (merge branches or use --clean to discard
changes)
hg also aborts if the user tries to use "hg update" to get to tip
(without specifying a revision) and tip is on another branch:
abort: crosses branches (use 'hg merge' or use 'hg update -c')
This message is changed in the same fashion:
abort: crosses branches (merge branches or use --check to force
update)
Augie Fackler <durin42@gmail.com> [Sat, 09 Oct 2010 17:58:48 -0500] rev 12680
hgweb: add help link to templates missed in ead4e21f49f1
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 09 Oct 2010 17:58:54 -0500] rev 12679
test-convert-svn-encoding.t: ignore that subversion %-encodes $TESTTMP
Use a glob instead of expecting $TESTTMP.