Show More
@@ -1,6 +1,11 b'' | |||||
1 | #testcases flat tree |
|
1 | #testcases flat tree | |
2 | #testcases lfs-on lfs-off |
|
2 | #testcases lfs-on lfs-off | |
3 |
|
3 | |||
|
4 | $ cat >> $HGRCPATH << EOF | |||
|
5 | > [experimental] | |||
|
6 | > evolution=createmarkers | |||
|
7 | > EOF | |||
|
8 | ||||
4 | #if lfs-on |
|
9 | #if lfs-on | |
5 | $ cat >> $HGRCPATH <<EOF |
|
10 | $ cat >> $HGRCPATH <<EOF | |
6 | > [extensions] |
|
11 | > [extensions] | |
@@ -77,10 +82,6 b' Test repo with local changes' | |||||
77 | updating to branch default |
|
82 | updating to branch default | |
78 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
83 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
79 | $ cd narrow-local-changes |
|
84 | $ cd narrow-local-changes | |
80 | $ cat >> $HGRCPATH << EOF |
|
|||
81 | > [experimental] |
|
|||
82 | > evolution=createmarkers |
|
|||
83 | > EOF |
|
|||
84 | $ echo local change >> d0/f |
|
85 | $ echo local change >> d0/f | |
85 | $ hg ci -m 'local change to d0' |
|
86 | $ hg ci -m 'local change to d0' | |
86 | $ hg co '.^' |
|
87 | $ hg co '.^' |
General Comments 0
You need to be logged in to leave comments.
Login now