equal
deleted
inserted
replaced
793 --force strip with local changes |
793 --force strip with local changes |
794 |
794 |
795 $ hg strip -f tip |
795 $ hg strip -f tip |
796 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
796 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
797 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) |
797 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) |
|
798 $ cd .. |
798 |
799 |
799 |
800 |
800 cd b; hg qrefresh |
801 cd b; hg qrefresh |
801 |
802 |
802 $ hg init refresh |
803 $ hg init refresh |
903 default 0:cb9a9f314b8b |
904 default 0:cb9a9f314b8b |
904 $ hg qpop |
905 $ hg qpop |
905 no patches applied |
906 no patches applied |
906 [1] |
907 [1] |
907 |
908 |
|
909 $ cd .. |
|
910 |
|
911 |
|
912 git patches |
|
913 |
908 $ cat >>$HGRCPATH <<EOF |
914 $ cat >>$HGRCPATH <<EOF |
909 > [diff] |
915 > [diff] |
910 > git = True |
916 > git = True |
911 > EOF |
917 > EOF |
912 $ cd .. |
|
913 $ hg init git |
918 $ hg init git |
914 $ cd git |
919 $ cd git |
915 $ hg qinit |
920 $ hg qinit |
916 |
921 |
917 $ hg qnew -m'new file' new |
922 $ hg qnew -m'new file' new |
1191 date: Thu Jan 01 00:00:00 1970 +0000 |
1196 date: Thu Jan 01 00:00:00 1970 +0000 |
1192 summary: add foo |
1197 summary: add foo |
1193 |
1198 |
1194 $ hg strip 1 |
1199 $ hg strip 1 |
1195 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1200 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1196 saved backup bundle to $TESTTMP/b/strip/.hg/strip-backup/*-backup.hg (glob) |
1201 saved backup bundle to $TESTTMP/strip/.hg/strip-backup/*-backup.hg (glob) |
1197 $ checkundo strip |
1202 $ checkundo strip |
1198 $ hg log |
1203 $ hg log |
1199 changeset: 1:20cbbe65cff7 |
1204 changeset: 1:20cbbe65cff7 |
1200 tag: tip |
1205 tag: tip |
1201 user: test |
1206 user: test |
1537 patch add-file2 finalized without changeset message |
1542 patch add-file2 finalized without changeset message |
1538 $ hg phase 'all()' |
1543 $ hg phase 'all()' |
1539 0: draft |
1544 0: draft |
1540 1: secret |
1545 1: secret |
1541 2: secret |
1546 2: secret |
|
1547 |
|
1548 $ cd .. |