mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
89eb6520d2
Summary:
The "meaningfulparents" concept is coupled with rev numbers.
Remove it. This changes default templates to not show parents, and `{parents}`
template to show parents.
Reviewed By: DurhamG
Differential Revision: D23408970
fbshipit-source-id: f1a8060122ee6655d9f64147b35a321af839266e
47 lines
1.0 KiB
Perl
47 lines
1.0 KiB
Perl
#chg-compatible
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
$ touch empty1
|
|
$ hg add empty1
|
|
$ hg commit -m 'add empty1'
|
|
|
|
$ touch empty2
|
|
$ hg add empty2
|
|
$ hg commit -m 'add empty2'
|
|
|
|
$ hg up -C 0
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ touch empty3
|
|
$ hg add empty3
|
|
$ hg commit -m 'add empty3'
|
|
|
|
$ hg heads
|
|
commit: a1cb177e0d44
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: add empty3
|
|
|
|
commit: 097d2b0e17f6
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: add empty2
|
|
|
|
|
|
$ hg merge 1
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
Before changeset 05257fd28591, we didn't notice the
|
|
empty file that came from rev 1:
|
|
|
|
$ hg status
|
|
M empty2
|
|
$ hg commit -m merge
|
|
$ hg manifest --debug tip
|
|
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1
|
|
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2
|
|
b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3
|
|
|
|
$ cd ..
|