Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge6.out @ 3115:c4e26f1ccfcc
merge: eliminate redundant security check
duplicated in applyupdates
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 19:54:01 -0500 |
parents | b2ae81a7df29 |
children | 8feb33c2d153 |
rev | line source |
---|---|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
1 2 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
|
2 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
|
3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
616 | 4 pulling from ../B1 |
5 searching for changes | |
6 adding changesets | |
7 adding manifests | |
775 | 8 adding file changes |
1043 | 9 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
|
10 (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
|
11 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
|
12 (branch merge, don't forget to commit) |
616 | 13 bar should remain deleted. |
993 | 14 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
616 | 15 pulling from ../A2 |
16 searching for changes | |
17 adding changesets | |
18 adding manifests | |
775 | 19 adding file changes |
1043 | 20 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
|
21 (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
|
22 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
|
23 (branch merge, don't forget to commit) |
616 | 24 bar should remain deleted. |
990 | 25 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |