mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
e0e01cbc81
Summary: This broke a bunch of tests. Revert it and re-enable all the tests. Reviewed By: DurhamG Differential Revision: D19665042 fbshipit-source-id: c3c17e3ac7e2ea028be5b5836bc8349cdf56184e
48 lines
1.1 KiB
Perl
48 lines
1.1 KiB
Perl
#chg-compatible
|
|
|
|
https://bz.mercurial-scm.org/1877
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg ci -m 'a'
|
|
$ echo b > a
|
|
$ hg ci -m'b'
|
|
$ hg up 0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg book main
|
|
$ hg book
|
|
* main 0:cb9a9f314b8b
|
|
$ echo c > c
|
|
$ hg add c
|
|
$ hg ci -m'c'
|
|
$ hg book
|
|
* main 2:d36c0562f908
|
|
$ hg heads
|
|
changeset: 2:d36c0562f908
|
|
bookmark: main
|
|
parent: 0:cb9a9f314b8b
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: c
|
|
|
|
changeset: 1:1e6c11564562
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: b
|
|
|
|
$ hg up 1e6c11564562
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(leaving bookmark main)
|
|
$ hg merge main
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg book
|
|
main 2:d36c0562f908
|
|
$ hg ci -m'merge'
|
|
$ hg book
|
|
main 2:d36c0562f908
|
|
|
|
$ cd ..
|