mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 01:39:21 +03:00
66d79c86c8
Summary: The postincoming checks prints out advice of the following forms: * `(run 'hg heads' to see heads)` * `(run 'hg heads' to see heads, 'hg merge' to merge)` * `(run 'hg heads .' to see heads, 'hg merge' to merge)` * `(run 'hg update' to get a working copy)` This advice is no longer useful, so remove it. Reviewed By: DurhamG, farnz Differential Revision: D15317185 fbshipit-source-id: 50ba576406c96715fa058399da53462be9b7a3bf
32 lines
710 B
Perl
32 lines
710 B
Perl
$ . helpers-usechg.sh
|
|
|
|
Test for changeset ba7c74081861
|
|
(update dirstate correctly for non-branchmerge updates)
|
|
$ hg init a
|
|
$ cd a
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg commit -m a
|
|
$ cd ..
|
|
$ hg clone a b
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd a
|
|
$ hg mv a b
|
|
$ hg commit -m move
|
|
$ echo b >> b
|
|
$ hg commit -m b
|
|
$ cd ../b
|
|
$ hg pull ../a
|
|
pulling from ../a
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 2 changes to 1 files
|
|
new changesets e3c9b40284e1:772b37f1ca37
|
|
$ hg update
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ cd ..
|