Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-copy.out @ 3044:fcadf7a32425
Merge with mpm
author | Josef "Jeff" Sipek <jeffpc@josefsipek.net> |
---|---|
date | Sun, 03 Sep 2006 06:06:02 -0400 |
parents | fb493241d7f6 |
children | c0b449154a90 |
comparison
equal
deleted
inserted
replaced
3043:2a4d4aecb2b4 | 3044:fcadf7a32425 |
---|---|
1 A b | 1 A b |
2 b | 2 b |
3 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | 3 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
4 we should see two history entries | 4 we should see two history entries |
5 changeset: 1:386a3cc01532710ca78aed9a54fa2f459c04f29c | 5 changeset: 1:386a3cc01532 |
6 tag: tip | 6 tag: tip |
7 user: test | 7 user: test |
8 date: Mon Jan 12 13:46:40 1970 +0000 | 8 date: Mon Jan 12 13:46:40 1970 +0000 |
9 files: b | 9 files: b |
10 description: | 10 description: |
11 2 | 11 2 |
12 | 12 |
13 | 13 |
14 changeset: 0:33aaa84a386bd609094aeb21a97c09436c482ef1 | 14 changeset: 0:33aaa84a386b |
15 user: test | 15 user: test |
16 date: Mon Jan 12 13:46:40 1970 +0000 | 16 date: Mon Jan 12 13:46:40 1970 +0000 |
17 files: a | 17 files: a |
18 description: | 18 description: |
19 1 | 19 1 |