tests/test-encode.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 06 Jun 2007 19:05:18 +0200
changeset 4510 e0bc2c575044
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Issue a warning if "-r ." is used with two working directory parents. Rationale for not aborting instead: The first parent is usually more important as it is the local branch during a merge and commands like 'hg diff' and 'hg diff -r.' behave still identically (except for the warning of course). Added a test for log -r. with one and two parents.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1258
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
     1
%% no changes
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
     2
%% no changes
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
     3
%% uncompressed contents in repo
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
     4
this is a test
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
     5
%% uncompress our working dir copy
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
     6
this is a test
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1258
diff changeset
     7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1258
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
     8
%% uncompress our new working dir copy
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
     9
this is a test