mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
7d0d5a5a60
Bookmarks will behave more like named branches when merge tries to pick
a revision to merge.
Bookmarks now to respect the current bookmarks. Bookmarks will not
accidentally merged with unnamed heads or other bookmarks. However merge
can pick heads with diverging bookmarks and pick those automatically.
We end up with two cases for picking a revision to merge:
(1) In case of an current bookmark, merge can pick a branch head that has a
diverged bookmark
(2) In case of no current bookmark, merge can pick a branch head that does not
have a bookmark.
94 lines
2.6 KiB
Perl
94 lines
2.6 KiB
Perl
# init
|
|
|
|
$ hg init
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg commit -m'a'
|
|
$ echo b > b
|
|
$ hg add b
|
|
$ hg commit -m'b'
|
|
$ hg up -C 0
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo c > c
|
|
$ hg add c
|
|
$ hg commit -m'c'
|
|
created new head
|
|
|
|
# test merging of diverged bookmarks
|
|
$ hg bookmark -r 1 "c@diverge"
|
|
$ hg bookmark -r 1 b
|
|
$ hg bookmark c
|
|
$ hg bookmarks
|
|
b 1:d2ae7f538514
|
|
* c 2:d36c0562f908
|
|
c@diverge 1:d2ae7f538514
|
|
$ hg merge "c@diverge"
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg commit -m'merge'
|
|
$ hg bookmarks
|
|
b 1:d2ae7f538514
|
|
* c 3:b8f96cf4688b
|
|
|
|
$ hg up -C 3
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo d > d
|
|
$ hg add d
|
|
$ hg commit -m'd'
|
|
|
|
$ hg up -C 3
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo e > e
|
|
$ hg add e
|
|
$ hg commit -m'e'
|
|
created new head
|
|
$ hg up -C 5
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg bookmark e
|
|
$ hg bookmarks
|
|
b 1:d2ae7f538514
|
|
c 3:b8f96cf4688b
|
|
* e 5:26bee9c5bcf3
|
|
|
|
# the picked side is bookmarked
|
|
|
|
$ hg up -C 4
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg merge
|
|
abort: heads are bookmarked - please merge with an explicit rev
|
|
(run 'hg heads' to see all heads)
|
|
[255]
|
|
|
|
# our revision is bookmarked
|
|
|
|
$ hg up -C e
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ hg merge
|
|
abort: no matching bookmark to merge - please merge with an explicit rev or bookmark
|
|
(run 'hg heads' to see all heads)
|
|
[255]
|
|
|
|
# merge bookmark heads
|
|
|
|
$ hg up -C 4
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ echo f > f
|
|
$ hg commit -Am "f"
|
|
adding f
|
|
$ hg up -C e
|
|
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
$ hg bookmarks -r 4 "e@diverged"
|
|
$ hg bookmarks
|
|
b 1:d2ae7f538514
|
|
c 3:b8f96cf4688b
|
|
* e 5:26bee9c5bcf3
|
|
e@diverged 4:a0546fcfe0fb
|
|
$ hg merge
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg commit -m'merge'
|
|
$ hg bookmarks
|
|
b 1:d2ae7f538514
|
|
c 3:b8f96cf4688b
|
|
* e 7:ca784329f0ba
|