equal
deleted
inserted
replaced
1160 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
1160 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
1161 $ hg log --template='{rev}:{node}\n' --hidden |
1161 $ hg log --template='{rev}:{node}\n' --hidden |
1162 1:a765632148dc55d38c35c4f247c618701886cb2f |
1162 1:a765632148dc55d38c35c4f247c618701886cb2f |
1163 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
1163 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
1164 |
1164 |
|
1165 test that parent prevent a changeset to be hidden |
|
1166 |
|
1167 $ hg up 1 -q |
|
1168 $ hg log --template='{rev}:{node}\n' |
|
1169 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1170 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1171 |
|
1172 test that second parent prevent a changeset to be hidden too |
|
1173 |
|
1174 $ hg debugsetparents 0 1 # nothing suitable to merge here |
|
1175 $ hg log --template='{rev}:{node}\n' |
|
1176 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1177 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1178 |
1165 clear extensions configuration |
1179 clear extensions configuration |
1166 $ echo '[extensions]' >> $HGRCPATH |
1180 $ echo '[extensions]' >> $HGRCPATH |
1167 $ echo "obs=!" >> $HGRCPATH |
1181 $ echo "obs=!" >> $HGRCPATH |
1168 $ cd .. |
1182 $ cd .. |
1169 |
1183 |