Mercurial Mercurial > mercurial / 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-merge-default.out
author Greg Ward <greg-hg@gerg.ca>
Tue, 15 Jun 2010 13:04:22 -0400
changeset 11402 367ce8514da0
parent 11173 5b48d819d5f9
permissions -rw-r--r--
extensions: recommend against using wrapfunction for repo methods Instead, all extensions should use the "dynamic subclass" trick: subclass repo.__class__ and then replace repo.__class__ with your new subclass. This avoids conflicts that happen when one extension uses wrapfunction and another uses subclassing to extend the same method of localrepository.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
adding a
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     2
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 5242
diff changeset 
     3
 
created new head
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     4
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 5242
diff changeset 
     5
 
created new head
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     6
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     7
 
% should fail because not at a head
6723
1fe6f365df2e merge: only in-branch merges can be implicit
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6336
diff changeset 
     8
 
abort: branch 'default' has 3 heads - please merge with an explicit rev
10355
a5576908b589 merge: add hints about the use of 'hg heads' to find the rev to merge
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9429
diff changeset 
     9
 
(run 'hg heads .' to see heads)
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    10
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    11
 
% should fail because > 2 heads
6723
1fe6f365df2e merge: only in-branch merges can be implicit
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6336
diff changeset 
    12
 
abort: branch 'default' has 3 heads - please merge with an explicit rev
10355
a5576908b589 merge: add hints about the use of 'hg heads' to find the rev to merge
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 9429
diff changeset 
    13
 
(run 'hg heads .' to see heads)
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    14
 
% should succeed
10504
d2c1fc440533 test-merge-default: make content of test repo clearer.
Greg Ward <greg-hg@gerg.ca>
parents: 10355
diff changeset 
    15
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    16
 
(branch merge, don't forget to commit)
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    17
 
% should succeed - 2 heads
10504
d2c1fc440533 test-merge-default: make content of test repo clearer.
Greg Ward <greg-hg@gerg.ca>
parents: 10355
diff changeset 
    18
 
changeset:   3:ea9ff125ff88
d2c1fc440533 test-merge-default: make content of test repo clearer.
Greg Ward <greg-hg@gerg.ca>
parents: 10355
diff changeset 
    19
 
parent:      1:1846eede8b68
8387
50b6af595e0c merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6723
diff changeset 
    20
 
user:        test
50b6af595e0c merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6723
diff changeset 
    21
 
date:        Thu Jan 01 00:00:00 1970 +0000
50b6af595e0c merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6723
diff changeset 
    22
 
summary:     d
50b6af595e0c merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6723
diff changeset 
    23
 







10504






d2c1fc440533
test-merge-default: make content of test repo clearer.



Greg Ward <greg-hg@gerg.ca>


parents: 
10355

diff
changeset




    24


0 files updated, 1 files merged, 0 files removed, 0 files unresolved







2915






013921c753bd
merge with other head by default, not tip.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    25


(branch merge, don't forget to commit)







5242






9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2915

diff
changeset




    26


% should fail because at tip












9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2915

diff
changeset




    27


abort: there is nothing to merge












9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2915

diff
changeset




    28


1 files updated, 0 files merged, 0 files removed, 0 files unresolved







2915






013921c753bd
merge with other head by default, not tip.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    29


% should fail because 1 head












013921c753bd
merge with other head by default, not tip.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    30


abort: there is nothing to merge - use "hg update" instead







10355






a5576908b589
merge: add hints about the use of 'hg heads' to find the rev to merge



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
9429

diff
changeset




    31


1 files updated, 0 files merged, 0 files removed, 0 files unresolved












a5576908b589
merge: add hints about the use of 'hg heads' to find the rev to merge



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
9429

diff
changeset




    32


marked working directory as branch foobranch












a5576908b589
merge: add hints about the use of 'hg heads' to find the rev to merge



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
9429

diff
changeset




    33


% should fail because merge with other branch












a5576908b589
merge: add hints about the use of 'hg heads' to find the rev to merge



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
9429

diff
changeset




    34


abort: branch 'foobranch' has one head - please merge with an explicit rev












a5576908b589
merge: add hints about the use of 'hg heads' to find the rev to merge



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
9429

diff
changeset




    35


(run 'hg heads' to see all heads)







10505






b3311e26f94f
merge: fix --preview to show all nodes that will be merged (issue2043).



Greg Ward <greg-hg@gerg.ca>


parents: 
10504

diff
changeset




    36


% merge preview not affected by common ancestor












b3311e26f94f
merge: fix --preview to show all nodes that will be merged (issue2043).



Greg Ward <greg-hg@gerg.ca>


parents: 
10504

diff
changeset




    37


2:2d95304fed5d












b3311e26f94f
merge: fix --preview to show all nodes that will be merged (issue2043).



Greg Ward <greg-hg@gerg.ca>


parents: 
10504

diff
changeset




    38


4:f25cbe84d8b3












b3311e26f94f
merge: fix --preview to show all nodes that will be merged (issue2043).



Greg Ward <greg-hg@gerg.ca>


parents: 
10504

diff
changeset




    39


5:a431fabd6039












b3311e26f94f
merge: fix --preview to show all nodes that will be merged (issue2043).



Greg Ward <greg-hg@gerg.ca>


parents: 
10504

diff
changeset




    40


6:e88e33f3bf62














mercurial