Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-up-local-change.out @ 1225:ea90162e210c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add --debugger global option With this option, hg will drop into the Python debugger on execution. Running 'continue' will execute normally, and the debugger will be reinvoked if an exception is raised.
author mpm@selenic.com
date Thu, 08 Sep 2005 17:09:31 -0700
parents 4f81068ed8cd
children 0e2be889ccd7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
1 adding a
396
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 388
diff changeset
2 diff -r c19d34741b0a a
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
3 --- a/a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
4 +++ b/a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
5 @@ -1,1 +1,1 @@
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
6 -a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
7 +abc
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
8 adding b
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 705
diff changeset
9 M a
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
10 resolving manifests
677
204328d345f1 Fix up test for update flags
Matt Mackall <mpm@selenic.com>
parents: 676
diff changeset
11 force None allow None moddirstate True linear True
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 350
diff changeset
12 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
13 a versions differ, resolve
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
14 remote created b
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
15 getting b
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
16 merging a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
17 resolving a
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 350
diff changeset
18 file a: other d730145abbf9 ancestor b789fdd96dc2
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
19 resolving manifests
677
204328d345f1 Fix up test for update flags
Matt Mackall <mpm@selenic.com>
parents: 676
diff changeset
20 force None allow 1 moddirstate True linear True
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 350
diff changeset
21 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 775
diff changeset
22 changeset: 1:1e71731e6fbb
388
398737777644 Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 382
diff changeset
23 tag: tip
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
24 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
25 date: Thu Jan 1 00:00:00 1970 +0000
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
26 summary: 2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
27
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
28 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
388
398737777644 Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 382
diff changeset
29 tag: tip
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
30 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
31 date: Thu Jan 1 00:00:00 1970 +0000
494
6020bde714e4 Fixed test for previous change of 'hg -v history'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 490
diff changeset
32 files: a b
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
33 description:
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
34 2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
35
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
36
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
37 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
38 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
39 date: Thu Jan 1 00:00:00 1970 +0000
494
6020bde714e4 Fixed test for previous change of 'hg -v history'.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 490
diff changeset
40 files: a
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
41 description:
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
42 1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
43
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
44
768
20e95c245bc3 Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents: 767
diff changeset
45 diff -r 1e71731e6fbb a
20e95c245bc3 Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents: 767
diff changeset
46 --- a/a
20e95c245bc3 Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents: 767
diff changeset
47 +++ b/a
20e95c245bc3 Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents: 767
diff changeset
48 @@ -1,1 +1,1 @@
20e95c245bc3 Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents: 767
diff changeset
49 -a2
20e95c245bc3 Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents: 767
diff changeset
50 +abc