Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-up-local-change.out @ 850:d2bf8b9534b1
Add temporary documentation files and profiling output to .hgignore
author | Samuel Tardieu <sam@rfc1149.net> |
---|---|
date | Sat, 06 Aug 2005 21:18:21 +0100 |
parents | 0902ffece4b4 |
children | 5a034646e472 |
rev | line source |
---|---|
331 | 1 + hg init |
2 + hg addremove | |
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
3 adding a |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
793
diff
changeset
|
4 + hg commit -m 1 -d 0 0 |
485 | 5 + hg clone . ../r2 |
331 | 6 + hg up |
7 + hg diff | |
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
|
8 diff -r c19d34741b0a a |
331 | 9 --- a/a |
10 +++ b/a | |
11 @@ -1,1 +1,1 @@ | |
12 -a | |
13 +abc | |
14 + hg addremove | |
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
15 adding b |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
793
diff
changeset
|
16 + hg commit -m 2 -d 0 0 |
331 | 17 + hg -q pull ../r1 |
18 + hg status | |
748 | 19 M a |
591 | 20 + hg --debug up |
331 | 21 resolving manifests |
677
204328d345f1
Fix up test for update flags
Matt Mackall <mpm@selenic.com>
parents:
676
diff
changeset
|
22 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
|
23 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
331 | 24 a versions differ, resolve |
25 remote created b | |
26 getting b | |
27 merging a | |
28 resolving a | |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
350
diff
changeset
|
29 file a: other d730145abbf9 ancestor b789fdd96dc2 |
591 | 30 + hg --debug up -m |
331 | 31 resolving manifests |
677
204328d345f1
Fix up test for update flags
Matt Mackall <mpm@selenic.com>
parents:
676
diff
changeset
|
32 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
|
33 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
331 | 34 + hg parents |
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
35 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
|
36 tag: tip |
331 | 37 user: test |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
38 date: Thu Jan 1 00:00:00 1970 |
331 | 39 summary: 2 |
40 | |
41 + hg -v history | |
42 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
|
43 tag: tip |
331 | 44 user: test |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
45 date: Thu Jan 1 00:00:00 1970 |
494
6020bde714e4
Fixed test for previous change of 'hg -v history'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
490
diff
changeset
|
46 files: a b |
331 | 47 description: |
48 2 | |
49 | |
546
c8ae964109c1
Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
495
diff
changeset
|
50 |
331 | 51 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
52 user: test | |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
53 date: Thu Jan 1 00:00:00 1970 |
494
6020bde714e4
Fixed test for previous change of 'hg -v history'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
490
diff
changeset
|
54 files: a |
331 | 55 description: |
56 1 | |
57 | |
546
c8ae964109c1
Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
495
diff
changeset
|
58 |
331 | 59 + hg diff |
768
20e95c245bc3
Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents:
767
diff
changeset
|
60 diff -r 1e71731e6fbb a |
20e95c245bc3
Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents:
767
diff
changeset
|
61 --- a/a |
20e95c245bc3
Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents:
767
diff
changeset
|
62 +++ b/a |
20e95c245bc3
Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents:
767
diff
changeset
|
63 @@ -1,1 +1,1 @@ |
20e95c245bc3
Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents:
767
diff
changeset
|
64 -a2 |
20e95c245bc3
Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents:
767
diff
changeset
|
65 +abc |