##// END OF EJS Templates
record: check that we are not committing a merge before patch selection...
record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.

File last commit:

r10469:b26c4a89 stable
r11237:feb2a58f stable
Show More
test-push-validation.out
12 lines | 371 B | text/plain | TextLexer
/ tests / test-push-validation.out
adding alpha
adding beta
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
pushing to $HGTMP/test-push-validation/test
searching for changes
adding changesets
adding manifests
adding file changes
transaction abort!
rollback completed
abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify