tests/test-up-local-change.out
author mpm@selenic.com
Sat, 30 Jul 2005 08:35:29 -0800
changeset 808 8f5637f0a0c0
parent 784 853bfbf1a312
parent 801 1f9ec150a476
child 814 0902ffece4b4
permissions -rw-r--r--
Merge with TAH
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     1
+ hg init
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     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
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 396
diff changeset
     5
+ hg clone . ../r2
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     6
+ hg up
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     9
--- a/a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    10
+++ b/a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    11
@@ -1,1 +1,1 @@
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    12
-a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    13
+abc
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    17
+ hg -q pull ../r1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    18
+ hg status
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 705
diff changeset
    19
M a
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    20
+ hg --debug up
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    24
 a versions differ, resolve
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    25
remote created b
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    26
getting b
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    27
merging a
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    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
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
    30
+ hg --debug up -m
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    39
summary:     2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    40
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    41
+ hg -v history
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    47
description:
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    48
2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    51
changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    55
description:
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    56
1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    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
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    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