tests/test-merge6.out
author Adrian Buehlmann <adrian@cadifra.com>
Fri, 21 Mar 2008 14:52:24 +0100
changeset 6338 0750f11152fe
parent 5405 8feb33c2d153
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6338
0750f11152fe clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents: 5405
diff changeset
     1
updating working directory
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
     2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
6338
0750f11152fe clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents: 5405
diff changeset
     3
updating working directory
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
     4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6338
0750f11152fe clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents: 5405
diff changeset
     5
updating working directory
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
     6
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
     7
pulling from ../B1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
     8
searching for changes
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
     9
adding changesets
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    10
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset
    11
adding file changes
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 993
diff changeset
    12
added 1 changesets with 1 changes to 1 files (+1 heads)
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1043
diff changeset
    13
(run 'hg heads' to see heads, 'hg merge' to merge)
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
    14
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
    15
(branch merge, don't forget to commit)
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    16
bar should remain deleted.
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 2175
diff changeset
    17
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    18
pulling from ../A2
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    19
searching for changes
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    20
adding changesets
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    21
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset
    22
adding file changes
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 993
diff changeset
    23
added 1 changesets with 0 changes to 0 files (+1 heads)
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1043
diff changeset
    24
(run 'hg heads' to see heads, 'hg merge' to merge)
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
    25
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
    26
(branch merge, don't forget to commit)
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset
    27
bar should remain deleted.
5405
8feb33c2d153 Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents: 2175
diff changeset
    28
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo