| author | Christian Ebert <blacktrash@gmx.net> |
| Wed, 05 Aug 2009 17:20:47 +0200 | |
| changeset 9306 | 7bd1b663727d |
| parent 8387 | 50b6af595e0c |
| child 9429 | d8143769e1d4 |
| permissions | -rw-r--r-- |
|
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 |
|
2915
013921c753bd
merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 |
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
|
10 |
% should fail because > 2 heads |
|
6723
1fe6f365df2e
merge: only in-branch merges can be implicit
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6336
diff
changeset
|
11 |
abort: branch 'default' has 3 heads - please merge with an explicit rev |
|
2915
013921c753bd
merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
12 |
% should succeed |
|
013921c753bd
merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
13 |
0 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
|
14 |
(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
|
15 |
% should succeed - 2 heads |
|
8387
50b6af595e0c
merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6723
diff
changeset
|
16 |
changeset: 1:ba677d0156c1 |
|
50b6af595e0c
merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6723
diff
changeset
|
17 |
user: test |
|
50b6af595e0c
merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6723
diff
changeset
|
18 |
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
|
19 |
summary: b |
|
50b6af595e0c
merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6723
diff
changeset
|
20 |
|
|
50b6af595e0c
merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6723
diff
changeset
|
21 |
changeset: 3:903c264cdf57 |
|
50b6af595e0c
merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6723
diff
changeset
|
22 |
parent: 1:ba677d0156c1 |
|
50b6af595e0c
merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6723
diff
changeset
|
23 |
user: test |
|
50b6af595e0c
merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6723
diff
changeset
|
24 |
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
|
25 |
summary: d |
|
50b6af595e0c
merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6723
diff
changeset
|
26 |
|
|
2915
013921c753bd
merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
27 |
0 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
|
28 |
(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
|
29 |
% 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
|
30 |
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
|
31 |
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
|
32 |
% should fail because 1 head |
|
013921c753bd
merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
33 |
abort: there is nothing to merge - use "hg update" instead |