comparison tests/test-issue1175.t @ 18743:70e2a22fd66e

merge with stable
author Kevin Bullock <kbullock@ringworld.org>
date Fri, 01 Mar 2013 10:05:37 -0600
parents 76b69cccb07a 5b7175377bab
children a387b0390082
comparison
equal deleted inserted replaced
18742:a07be8953733 18743:70e2a22fd66e
29 29
30 $ hg ci --debug --traceback -Am5 b 30 $ hg ci --debug --traceback -Am5 b
31 b 31 b
32 b: searching for copy revision for a 32 b: searching for copy revision for a
33 b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db 33 b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db
34 committed changeset 5:89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b 34 committed changeset 5:732aafbecb501a198b3cc9323ad3899ff04ccf95
35 35
36 $ hg verify 36 $ hg verify
37 checking changesets 37 checking changesets
38 checking manifests 38 checking manifests
39 crosschecking files in changesets and manifests 39 crosschecking files in changesets and manifests
43 $ hg export --git tip 43 $ hg export --git tip
44 # HG changeset patch 44 # HG changeset patch
45 # User test 45 # User test
46 # Date 0 0 46 # Date 0 0
47 # Thu Jan 01 00:00:00 1970 +0000 47 # Thu Jan 01 00:00:00 1970 +0000
48 # Node ID 89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b 48 # Node ID 732aafbecb501a198b3cc9323ad3899ff04ccf95
49 # Parent 7fc86ba705e717a721dbc361bf8c9bc05a18ca2f 49 # Parent 1d1625283f71954f21d14c3d44d0ad3c019c597f
50 5 50 5
51 51
52 diff --git a/b b/b 52 diff --git a/b b/b
53 new file mode 100644 53 new file mode 100644
54 54