equal
deleted
inserted
replaced
1394 |
1394 |
1395 apply force, should discard changes in hello, but not bye |
1395 apply force, should discard changes in hello, but not bye |
1396 |
1396 |
1397 $ hg qpush -f --verbose --config 'ui.origbackuppath=.hg/origbackups' |
1397 $ hg qpush -f --verbose --config 'ui.origbackuppath=.hg/origbackups' |
1398 applying empty |
1398 applying empty |
1399 creating directory: $TESTTMP/forcepush/.hg/origbackups |
1399 creating directory: $TESTTMP/forcepush/.hg/origbackups (glob) |
1400 saving current version of hello.txt as $TESTTMP/forcepush/.hg/origbackups/hello.txt.orig |
1400 saving current version of hello.txt as $TESTTMP/forcepush/.hg/origbackups/hello.txt.orig (glob) |
1401 patching file hello.txt |
1401 patching file hello.txt |
1402 committing files: |
1402 committing files: |
1403 hello.txt |
1403 hello.txt |
1404 committing manifest |
1404 committing manifest |
1405 committing changelog |
1405 committing changelog |