##// END OF EJS Templates
fetch: switch the default parent used for a merge...
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.

File last commit:

r5406:f11554a0 default
r6206:0b6f1249 default
Show More
test-manifest.out
23 lines | 294 B | text/plain | TextLexer
/ tests / test-manifest.out
Bryan O'Sullivan
manifest: accept -r for rev specification
r5155 a
b/a
Patrick Mezard
test-manifest: test symlink and exec bit display
r5406 l
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 644 a
Patrick Mezard
test-manifest: test symlink and exec bit display
r5406 755 * b/a
644 @ l
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
Patrick Mezard
test-manifest: test symlink and exec bit display
r5406 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a
047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l
Bryan O'Sullivan
manifest: accept -r for rev specification
r5155 a
Patrick Mezard
test-manifest: test symlink and exec bit display
r5406 l
Bryan O'Sullivan
manifest: accept -r for rev specification
r5155 a
b/a
Patrick Mezard
test-manifest: test symlink and exec bit display
r5406 l
Bryan O'Sullivan
manifest: accept -r for rev specification
r5155 a
b/a
Patrick Mezard
test-manifest: test symlink and exec bit display
r5406 l
Bryan O'Sullivan
manifest: accept -r for rev specification
r5155 % should fail
abort: unknown revision '2'!
abort: please specify just one revision
a
b/a
Patrick Mezard
test-manifest: test symlink and exec bit display
r5406 l