Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge1.out
author Matt Mackall <mpm@selenic.com>
Tue, 10 Oct 2006 01:16:06 -0500
changeset 3311 966632304dde
parent 2973 a31557193f3c
child 3331 f472cf9a71af
permissions -rw-r--r--
merge: shortcircuit filemerge for identical files - use filectx.cmp to compare files - move merge messages into filemerge - kill the redundant resolving message - update tests
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1995
diff changeset 
     1
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset 
     2
 
%% no merges expected
2973
a31557193f3c merge: simplify working dir manifest generation
Matt Mackall <mpm@selenic.com>
parents: 2175
diff changeset 
     3
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1995
diff changeset 
     4
 
(branch merge, don't forget to commit)
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1995
diff changeset 
     5
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1581
db10b7114de0 abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1236
diff changeset 
     6
 
%% merge should fail
db10b7114de0 abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1236
diff changeset 
     7
 
abort: 'b' already exists in the working dir and differs from remote
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset 
     8
 
%% merge of b expected
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
     9
 
merging for b
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    10
 
merging b
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1995
diff changeset 
    11
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1995
diff changeset 
    12
 
(branch merge, don't forget to commit)
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset 
    13
 
%%
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1995
diff changeset 
    14
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset 
    15
 
Contents of b should be "this is file b1"
430
5b22029b5aa2 Fix up test-merge1
mpm@selenic.com
parents: 407
diff changeset 
    16
 
This is file b1
1581
db10b7114de0 abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1236
diff changeset 
    17
 
%% merge fails
1995
2da2d46862fb Spelling fix: "commited" -> "committed"
mcmillen@cs.cmu.edu
parents: 1581
diff changeset 
    18
 
abort: outstanding uncommitted changes
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset 
    19
 
%% merge expected!
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1995
diff changeset 
    20
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1995
diff changeset 
    21
 
(branch merge, don't forget to commit)
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1995
diff changeset 
    22
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1581
db10b7114de0 abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1236
diff changeset 
    23
 
%% merge of b should fail
1995
2da2d46862fb Spelling fix: "commited" -> "committed"
mcmillen@cs.cmu.edu
parents: 1581
diff changeset 
    24
 
abort: outstanding uncommitted changes
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset 
    25
 
%% merge of b expected
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    26
 
merging for b
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset 
    27
 
merging b
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1995
diff changeset 
    28
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1995
diff changeset 
    29
 
(branch merge, don't forget to commit)
Mercurial