tests/test-merge-default.t
author Yuya Nishihara <yuya@tcha.org>
Tue, 13 Nov 2018 22:15:30 +0900
changeset 40618 ff8b2886c492
parent 39626 6ecfd12f09cd
child 43114 8197b395710e
permissions -rw-r--r--
templater: check invalid use of list expression properly (issue5920) The error message is still cryptic, but it should be better.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
     1
  $ hg init
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
     2
  $ echo a > a
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
     3
  $ hg commit -A -ma
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
     4
  adding a
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     5
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
     6
  $ echo b >> a
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
     7
  $ hg commit -mb
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
     8
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
     9
  $ echo c >> a
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    10
  $ hg commit -mc
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    11
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    12
  $ hg up 1
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    13
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    14
  $ echo d >> a
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    15
  $ hg commit -md
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    16
  created new head
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    17
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    18
  $ hg up 1
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    19
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    20
  $ echo e >> a
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    21
  $ hg commit -me
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    22
  created new head
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    23
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    24
  $ hg up 1
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    25
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    26
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    27
Should fail because not at a head:
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    28
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    29
  $ hg merge
28103
7d852bb47b0a merge: give priority to "not at head" failures for bare 'hg merge'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28029
diff changeset
    30
  abort: working directory not at a head revision
7d852bb47b0a merge: give priority to "not at head" failures for bare 'hg merge'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28029
diff changeset
    31
  (use 'hg update' or merge with an explicit revision)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12255
diff changeset
    32
  [255]
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    33
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    34
  $ hg up
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    35
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
32698
1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 28139
diff changeset
    36
  updated to "f25cbe84d8b3: e"
28029
72072cfc7e91 update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26716
diff changeset
    37
  2 other heads for branch "default"
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    38
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    39
Should fail because > 2 heads:
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    40
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    41
  $ HGMERGE=internal:other; export HGMERGE
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    42
  $ hg merge
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    43
  abort: branch 'default' has 3 heads - please merge with an explicit rev
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    44
  (run 'hg heads .' to see heads)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12255
diff changeset
    45
  [255]
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    46
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    47
Should succeed:
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    48
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    49
  $ hg merge 2
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    50
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    51
  (branch merge, don't forget to commit)
33051
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    52
  $ hg id -Tjson
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    53
  [
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    54
   {
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    55
    "bookmarks": [],
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    56
    "branch": "default",
33054
a49ab7f5e7e7 identify: rename 'changed' keyword -> 'dirty'
Matt Harbison <matt_harbison@yahoo.com>
parents: 33051
diff changeset
    57
    "dirty": "+",
39625
10c5eacd793f identify: use fm.hexfunc thoroughly
Yuya Nishihara <yuya@tcha.org>
parents: 33089
diff changeset
    58
    "id": "f25cbe84d8b320e298e7703f18a25a3959518c23+2d95304fed5d89bc9d70b2a0d02f0d567469c3ab+",
33051
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    59
    "node": "ffffffffffffffffffffffffffffffffffffffff",
39626
6ecfd12f09cd identify: change {parents} to a list of nodes (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 39625
diff changeset
    60
    "parents": ["f25cbe84d8b320e298e7703f18a25a3959518c23", "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab"],
33051
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    61
    "tags": ["tip"]
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    62
   }
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    63
  ]
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    64
  $ hg commit -mm1
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    65
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    66
Should succeed - 2 heads:
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    67
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    68
  $ hg merge -P
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    69
  changeset:   3:ea9ff125ff88
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    70
  parent:      1:1846eede8b68
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    71
  user:        test
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    72
  date:        Thu Jan 01 00:00:00 1970 +0000
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    73
  summary:     d
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    74
  
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    75
  $ hg merge
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    76
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    77
  (branch merge, don't forget to commit)
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    78
  $ hg commit -mm2
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    79
33051
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    80
  $ hg id -r 1 -Tjson
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    81
  [
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    82
   {
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    83
    "bookmarks": [],
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    84
    "branch": "default",
39625
10c5eacd793f identify: use fm.hexfunc thoroughly
Yuya Nishihara <yuya@tcha.org>
parents: 33089
diff changeset
    85
    "id": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1",
33051
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    86
    "node": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1",
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    87
    "tags": []
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    88
   }
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    89
  ]
15a79ac823e8 identify: add template support
Matt Harbison <matt_harbison@yahoo.com>
parents: 32698
diff changeset
    90
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    91
Should fail because at tip:
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    92
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    93
  $ hg merge
15619
6c8573dd1b6b merge: make 'nothing to merge' aborts consistent
Kevin Bullock <kbullock@ringworld.org>
parents: 12316
diff changeset
    94
  abort: nothing to merge
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12255
diff changeset
    95
  [255]
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    96
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    97
  $ hg up 0
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
    98
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5242
9cd6578750b9 improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2915
diff changeset
    99
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   100
Should fail because there is only one head:
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   101
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   102
  $ hg merge
15619
6c8573dd1b6b merge: make 'nothing to merge' aborts consistent
Kevin Bullock <kbullock@ringworld.org>
parents: 12316
diff changeset
   103
  abort: nothing to merge
6c8573dd1b6b merge: make 'nothing to merge' aborts consistent
Kevin Bullock <kbullock@ringworld.org>
parents: 12316
diff changeset
   104
  (use 'hg update' instead)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12255
diff changeset
   105
  [255]
2915
013921c753bd merge with other head by default, not tip.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   106
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   107
  $ hg up 3
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   108
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   109
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   110
  $ echo f >> a
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   111
  $ hg branch foobranch
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   112
  marked working directory as branch foobranch
15615
41885892796e branch: warn on branching
Matt Mackall <mpm@selenic.com>
parents: 12316
diff changeset
   113
  (branches are permanent and global, did you want a bookmark?)
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   114
  $ hg commit -mf
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   115
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   116
Should fail because merge with other branch:
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   117
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   118
  $ hg merge
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   119
  abort: branch 'foobranch' has one head - please merge with an explicit rev
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   120
  (run 'hg heads' to see all heads)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12255
diff changeset
   121
  [255]
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: 8834
diff changeset
   122
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   123
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   124
Test for issue2043: ensure that 'merge -P' shows ancestors of 6 that
22389
94f77624dbb5 comments: describe ancestor consistently - avoid 'least common ancestor'
Mads Kiilerich <madski@unity3d.com>
parents: 15623
diff changeset
   125
are not ancestors of 7, regardless of where their common ancestors are.
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   126
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   127
Merge preview not affected by common ancestor:
10505
b3311e26f94f merge: fix --preview to show all nodes that will be merged (issue2043).
Greg Ward <greg-hg@gerg.ca>
parents: 10504
diff changeset
   128
12255
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   129
  $ hg up -q 7
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   130
  $ hg merge -q -P 6
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   131
  2:2d95304fed5d
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   132
  4:f25cbe84d8b3
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   133
  5:a431fabd6039
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   134
  6:e88e33f3bf62
9b3c02c36d92 tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com>
parents: 10658
diff changeset
   135
26716
c027641f8a83 revset: rename and test '_destmerge'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22389
diff changeset
   136
Test experimental destination revset
c027641f8a83 revset: rename and test '_destmerge'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22389
diff changeset
   137
c027641f8a83 revset: rename and test '_destmerge'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22389
diff changeset
   138
  $ hg log -r '_destmerge()'
c027641f8a83 revset: rename and test '_destmerge'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22389
diff changeset
   139
  abort: branch 'foobranch' has one head - please merge with an explicit rev
c027641f8a83 revset: rename and test '_destmerge'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22389
diff changeset
   140
  (run 'hg heads' to see all heads)
c027641f8a83 revset: rename and test '_destmerge'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22389
diff changeset
   141
  [255]
c027641f8a83 revset: rename and test '_destmerge'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22389
diff changeset
   142
28139
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   143
(on a branch with a two heads)
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   144
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   145
  $ hg up 5
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   146
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   147
  $ echo f >> a
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   148
  $ hg commit -mf
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   149
  created new head
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   150
  $ hg log -r '_destmerge()'
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   151
  changeset:   6:e88e33f3bf62
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   152
  parent:      5:a431fabd6039
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   153
  parent:      3:ea9ff125ff88
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   154
  user:        test
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   155
  date:        Thu Jan 01 00:00:00 1970 +0000
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   156
  summary:     m2
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   157
  
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   158
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   159
(from the other head)
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   160
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   161
  $ hg log -r '_destmerge(e88e33f3bf62)'
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   162
  changeset:   8:b613918999e2
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   163
  tag:         tip
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   164
  parent:      5:a431fabd6039
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   165
  user:        test
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   166
  date:        Thu Jan 01 00:00:00 1970 +0000
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   167
  summary:     f
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   168
  
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   169
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   170
(from unrelated branch)
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   171
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   172
  $ hg log -r '_destmerge(foobranch)'
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   173
  abort: branch 'foobranch' has one head - please merge with an explicit rev
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   174
  (run 'hg heads' to see all heads)
5476a7a039c0 destutil: allow to specify an explicit source for the merge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28103
diff changeset
   175
  [255]