equal
deleted
inserted
replaced
161 @@ -2,3 +2,4 @@ |
161 @@ -2,3 +2,4 @@ |
162 foo |
162 foo |
163 do not process $Id: |
163 do not process $Id: |
164 xxx $ |
164 xxx $ |
165 +bar |
165 +bar |
166 rolling back to revision 3 (undo commit) |
166 rolling back to revision 2 (undo commit) |
167 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
167 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
168 % init --mq |
168 % init --mq |
169 % qimport |
169 % qimport |
170 % commit --mq |
170 % commit --mq |
171 % keywords should not be expanded in patch |
171 % keywords should not be expanded in patch |
460 $Id: m 41efa6d38e9b Thu, 01 Jan 1970 00:00:00 +0000 test $ |
460 $Id: m 41efa6d38e9b Thu, 01 Jan 1970 00:00:00 +0000 test $ |
461 bar |
461 bar |
462 % test restricted mode with transplant -b |
462 % test restricted mode with transplant -b |
463 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
463 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
464 marked working directory as branch foo |
464 marked working directory as branch foo |
465 created new head |
|
466 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
465 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
467 applying 4aa30d025d50 |
466 applying 4aa30d025d50 |
468 4aa30d025d50 transplanted to 5a4da427c162 |
467 4aa30d025d50 transplanted to 5a4da427c162 |
469 % no expansion in changeset |
468 % no expansion in changeset |
470 changeset: 11:5a4da427c162 |
469 changeset: 11:5a4da427c162 |