equal
deleted
inserted
replaced
1199 |
1199 |
1200 $ hg debugsetparents 0 1 # nothing suitable to merge here |
1200 $ hg debugsetparents 0 1 # nothing suitable to merge here |
1201 $ hg log --template='{rev}:{node}\n' |
1201 $ hg log --template='{rev}:{node}\n' |
1202 1:a765632148dc55d38c35c4f247c618701886cb2f |
1202 1:a765632148dc55d38c35c4f247c618701886cb2f |
1203 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
1203 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1204 $ hg debugsetparents 1 |
|
1205 $ hg up -q null |
|
1206 |
|
1207 bookmarks prevent a changeset being hidden |
|
1208 |
|
1209 $ hg bookmark --hidden -r 1 X |
|
1210 $ hg log --template '{rev}:{node}\n' |
|
1211 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1212 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
1204 |
1213 |
1205 clear extensions configuration |
1214 clear extensions configuration |
1206 $ echo '[extensions]' >> $HGRCPATH |
1215 $ echo '[extensions]' >> $HGRCPATH |
1207 $ echo "obs=!" >> $HGRCPATH |
1216 $ echo "obs=!" >> $HGRCPATH |
1208 $ cd .. |
1217 $ cd .. |