equal
deleted
inserted
replaced
1 #testcases flat tree |
1 #testcases flat tree |
2 #testcases lfs-on lfs-off |
2 #testcases lfs-on lfs-off |
|
3 |
|
4 $ cat >> $HGRCPATH << EOF |
|
5 > [experimental] |
|
6 > evolution=createmarkers |
|
7 > EOF |
3 |
8 |
4 #if lfs-on |
9 #if lfs-on |
5 $ cat >> $HGRCPATH <<EOF |
10 $ cat >> $HGRCPATH <<EOF |
6 > [extensions] |
11 > [extensions] |
7 > lfs = |
12 > lfs = |
75 added 6 changesets with 3 changes to 3 files |
80 added 6 changesets with 3 changes to 3 files |
76 new changesets *:* (glob) |
81 new changesets *:* (glob) |
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 '.^' |
87 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88 $ echo local change >> d3/f |
89 $ echo local change >> d3/f |