equal
deleted
inserted
replaced
36 merging foo and baz to baz |
36 merging foo and baz to baz |
37 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
37 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
38 (branch merge, don't forget to commit) |
38 (branch merge, don't forget to commit) |
39 $ hg ci -m 'merge remote copy' -d '4 0' |
39 $ hg ci -m 'merge remote copy' -d '4 0' |
40 created new head |
40 created new head |
|
41 |
|
42 Make and delete some tags |
|
43 |
|
44 $ hg tag that |
|
45 $ hg tag --remove that |
|
46 $ hg tag this |
|
47 |
41 #if execbit |
48 #if execbit |
42 $ chmod +x baz |
49 $ chmod +x baz |
43 #else |
50 #else |
44 $ echo some other change to make sure we get a rev 5 > baz |
51 $ echo some other change to make sure we get a rev 5 > baz |
45 #endif |
52 #endif |
48 $ hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' |
55 $ hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' |
49 initializing destination new repository |
56 initializing destination new repository |
50 scanning source... |
57 scanning source... |
51 sorting... |
58 sorting... |
52 converting... |
59 converting... |
53 5 add foo bar |
60 8 add foo bar |
54 4 change foo |
61 7 change foo |
55 3 make bar and baz copies of foo |
62 6 make bar and baz copies of foo |
56 2 merge local copy |
63 5 merge local copy |
57 1 merge remote copy |
64 4 merge remote copy |
|
65 3 Added tag that for changeset 88586c4e9f02 |
|
66 2 Removed tag that |
|
67 1 Added tag this for changeset c56a7f387039 |
58 0 mark baz executable |
68 0 mark baz executable |
59 updating bookmarks |
69 updating bookmarks |
60 $ cd new |
70 $ cd new |
61 $ hg out ../orig |
71 $ hg out ../orig |
62 comparing with ../orig |
72 comparing with ../orig |
64 no changes found |
74 no changes found |
65 [1] |
75 [1] |
66 #if execbit |
76 #if execbit |
67 $ hg bookmarks |
77 $ hg bookmarks |
68 premerge1 3:973ef48a98a4 |
78 premerge1 3:973ef48a98a4 |
69 premerge2 5:13d9b87cf8f8 |
79 premerge2 8:91d107c423ba |
70 #else |
80 #else |
71 Different hash because no x bit |
81 Different hash because no x bit |
72 $ hg bookmarks |
82 $ hg bookmarks |
73 premerge1 3:973ef48a98a4 |
83 premerge1 3:973ef48a98a4 |
74 premerge2 5:df0779bcf33c |
84 premerge2 8:3537b15eaaca |
75 #endif |
85 #endif |
76 $ cd .. |
86 $ cd .. |
77 |
87 |
78 check shamap LF and CRLF handling |
88 check shamap LF and CRLF handling |
79 |
89 |